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

Merge "AOD: Do not show guts nor snooze" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-18 00:07:58 +00:00
committed by Android (Google) Code Review
parent 4bcc9bf0f2 3ca223a8ce
commit 96da371a6d
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/src/com/android/systemui/statusbar/NotificationMenuRow.java
View File

@@ -227,6 +227,7 @@ public class NotificationMenuRow implements NotificationMenuRowPlugin, View.OnCl
if (mShouldShowMenu if (mShouldShowMenu
&& !NotificationStackScrollLayout.isPinnedHeadsUp(view) && !NotificationStackScrollLayout.isPinnedHeadsUp(view)
&& !mParent.areGutsExposed() && !mParent.areGutsExposed()
&& !mParent.isDark()
&& (mCheckForDrag == null || !mHandler.hasCallbacks(mCheckForDrag))) { && (mCheckForDrag == null || !mHandler.hasCallbacks(mCheckForDrag))) {
// Only show the menu if we're not a heads up view and guts aren't exposed. // Only show the menu if we're not a heads up view and guts aren't exposed.
mCheckForDrag = new CheckForDrag(); mCheckForDrag = new CheckForDrag();

3
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
View File

@@ -5862,6 +5862,9 @@ public class StatusBar extends SystemUI implements DemoMode,
} }
final ExpandableNotificationRow row = (ExpandableNotificationRow) v; final ExpandableNotificationRow row = (ExpandableNotificationRow) v;
if (row.isDark()) {
return false;
}
bindGuts(row, item); bindGuts(row, item);
NotificationGuts guts = row.getGuts(); NotificationGuts guts = row.getGuts();