Merge "Don't clear effects when the panel is fully collapsed." into nyc-dev (ffaf9445) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -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 −0

Original line number	Diff line number	Diff line
		@@ -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();