Merge "Added safeguard to make sure Panel is visible when unlocked" into qt-r1-dev (7c8d3fc3) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -4747,7 +4747,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd
		boolean nowFullyHidden = mAmbientState.isFullyHidden();
		boolean nowHiddenAtAll = mAmbientState.isHiddenAtAll();
		if (nowFullyHidden != wasFullyHidden) {
		setVisibility(mAmbientState.isFullyHidden() ? View.INVISIBLE : View.VISIBLE);
		updateVisibility();
		}
		if (!wasHiddenAtAll && nowHiddenAtAll) {
		resetExposedMenuView(true /* animate /, true / animate */);
		@@ -4760,6 +4760,11 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd
		requestChildrenUpdate();
		}

		private void updateVisibility() {
		boolean shouldShow = !mAmbientState.isFullyHidden() \|\| !onKeyguard();
		setVisibility(shouldShow ? View.VISIBLE : View.INVISIBLE);
		}

		@ShadeViewRefactor(RefactorComponent.STATE_RESOLVER)
		public void notifyHideAnimationStart(boolean hide) {
		// We only swap the scaling factor if we're fully hidden or fully awake to avoid
		@@ -5268,6 +5273,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd
		onUpdateRowStates();

		mEntryManager.updateNotifications();
		updateVisibility();
		}

		@ShadeViewRefactor(RefactorComponent.SHADE_VIEW)