Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "AOD: prevent clicking shelf when dark"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-03-29 20:46:32 +00:00
committed by Android (Google) Code Review
parent 861a0f9176 ed3af783f7
commit 9bf875932d
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java
View File

@@ -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