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

Merge "Don't clear effects when the panel is fully collapsed." into nyc-dev

Browse Source
This commit is contained in:
Daniel Sandler
2016-03-17 03:26:15 +00:00
committed by Android (Google) Code Review
parent e6031bfdd4 cb0128941c
commit ffaf94459a
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
View File

@@ -1856,15 +1856,16 @@ public abstract class BaseStatusBar extends SystemUI implements
/**
* The LEDs are turned off when the notification panel is shown, even just a little bit.
* See also NotificationStackScrollLayout.setIsExpanded() for another place where we
* attempt to do this.
*/
protected void handleVisibleToUserChanged(boolean visibleToUser) {
try {
if (visibleToUser) {
boolean pinnedHeadsUp = mHeadsUpManager.hasPinnedHeadsUp();
boolean clearNotificationEffects =
((mShowLockscreenNotifications && mState == StatusBarState.KEYGUARD) ||
(!pinnedHeadsUp && (mState == StatusBarState.SHADE
|| mState == StatusBarState.SHADE_LOCKED)));
!isPanelFullyCollapsed() &&
(mState == StatusBarState.SHADE || mState == StatusBarState.SHADE_LOCKED);
int notificationLoad = mNotificationData.getActiveNotifications().size();
if (pinnedHeadsUp && isPanelFullyCollapsed()) {
notificationLoad = 1;

10
packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
View File

@@ -2691,6 +2691,16 @@ public class NotificationStackScrollLayout extends ViewGroup
if (changed) {
if (!mIsExpanded) {
mGroupManager.collapseAllGroups();
} else {
// XXX: HACK: we should not be clearing notification effects from way down here.
// But at the moment we don't have a reliable way to know when the window is
// actually exposed to the air, so
if (mPhoneStatusBar.getBarState() != StatusBarState.KEYGUARD) {
if (DEBUG) {
Log.v(TAG, "clearing notification effects from scroller");
}
mPhoneStatusBar.clearNotificationEffects();
}
}
updateNotificationAnimationStates();
updateChronometers();