Merge "Hide notification footer when QS is expanded." (4fd2d762) · Commits · e / os / android_frameworks_base

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -683,6 +683,7 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
		boolean showFooterView = (showDismissView \|\| mController.getVisibleNotificationCount() > 0)
		&& mIsCurrentUserSetup // see: b/193149550
		&& mStatusBarState != StatusBarState.KEYGUARD
		&& mQsExpansionFraction != 1
		&& !mScreenOffAnimationController.shouldHideNotificationsFooter()
		&& !mIsRemoteInputActive;
		boolean showHistory = Settings.Secure.getIntForUser(mContext.getContentResolver(),
		@@ -4769,6 +4770,8 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable

		@ShadeViewRefactor(RefactorComponent.SHADE_VIEW)
		public void setQsExpansionFraction(float qsExpansionFraction) {
		boolean footerAffected = mQsExpansionFraction != qsExpansionFraction
		&& (mQsExpansionFraction == 1 \|\| qsExpansionFraction == 1);
		mQsExpansionFraction = qsExpansionFraction;
		updateUseRoundedRectClipping();

		@@ -4777,6 +4780,9 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable
		if (mOwnScrollY > 0) {
		setOwnScrollY((int) MathUtils.lerp(mOwnScrollY, 0, mQsExpansionFraction));
		}
		if (footerAffected) {
		updateFooter();
		}
		}

		@ShadeViewRefactor(RefactorComponent.COORDINATOR)