diff options
| author | 2017-03-28 17:54:05 -0700 | |
|---|---|---|
| committer | 2017-04-05 11:23:21 -0700 | |
| commit | 03cf2586faef0bc4971cbda99bd13d608ed23e0d (patch) | |
| tree | f5e0bee8369727a3afa30f76416aa4278111f8f7 | |
| parent | 2b33162e82ba0c0d4af45c1c73157745a0adc061 (diff) | |
AOD: prevent clicking shelf when dark
Fixes: 35718464
Test: Enable AOD, try clicking on shelf in AOD, make sure it's not clickable.
Change-Id: Iede88d1e0ab394f0db2acaac6a1ad8baaeef15f1
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java index 8da17fa76bd7..8ba4eb57f079 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java @@ -133,6 +133,7 @@ public class NotificationShelf extends ActivatableNotificationView implements mViewInvertHelper.update(dark); } mShelfIcons.setAmbient(dark); + updateInteractiveness(); } @Override @@ -576,7 +577,8 @@ public class NotificationShelf extends ActivatableNotificationView implements } private void updateInteractiveness() { - mInteractive = mStatusBarState == StatusBarState.KEYGUARD && mHasItemsInStableShelf; + mInteractive = mStatusBarState == StatusBarState.KEYGUARD && mHasItemsInStableShelf + && !mDark; setClickable(mInteractive); setFocusable(mInteractive); setImportantForAccessibility(mInteractive ? View.IMPORTANT_FOR_ACCESSIBILITY_YES |