diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java b/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java index 4bf85c7a336f..8a0079d2c537 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java +++ b/packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java @@ -42,6 +42,7 @@ import com.android.systemui.qs.QSTile; import com.android.systemui.statusbar.phone.NotificationsQuickSettingsContainer; import com.android.systemui.statusbar.phone.PhoneStatusBar; import com.android.systemui.statusbar.phone.QSTileHost; +import com.android.systemui.statusbar.policy.KeyguardMonitor.Callback; import java.util.ArrayList; import java.util.List; @@ -141,6 +142,7 @@ public class QSCustomizer extends LinearLayout implements OnMenuItemClickListene mNotifQsContainer.setCustomizerShowing(true); announceForAccessibility(mContext.getString( R.string.accessibility_desc_quick_settings_edit)); + mHost.getKeyguardMonitor().addCallback(mKeyguardCallback); } } @@ -156,6 +158,7 @@ public class QSCustomizer extends LinearLayout implements OnMenuItemClickListene mNotifQsContainer.setCustomizerShowing(false); announceForAccessibility(mContext.getString( R.string.accessibility_desc_quick_settings)); + mHost.getKeyguardMonitor().removeCallback(mKeyguardCallback); } } @@ -201,6 +204,15 @@ public class QSCustomizer extends LinearLayout implements OnMenuItemClickListene mTileAdapter.saveSpecs(mHost); } + private final Callback mKeyguardCallback = new Callback() { + @Override + public void onKeyguardChanged() { + if (mHost.getKeyguardMonitor().isShowing()) { + hide(0, 0); + } + } + }; + private final AnimatorListener mExpandAnimationListener = new AnimatorListenerAdapter() { @Override public void onAnimationEnd(Animator animation) { |