Merge "Don't pass QS expand state to NPVC in split shade mode." into sc-v2-dev (39b28716) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java

+8 −2

Original line number	Diff line number	Diff line
		@@ -2206,7 +2206,7 @@ public class NotificationPanelViewController extends PanelViewController {
		mQs.setExpanded(mQsExpanded);
		}

		private void setQsExpansion(float height) {
		void setQsExpansion(float height) {
		height = Math.min(Math.max(height, mQsMinExpansionHeight), mQsMaxExpansionHeight);
		mQsFullyExpanded = height == mQsMaxExpansionHeight && mQsMaxExpansionHeight != 0;
		if (height > mQsMinExpansionHeight && !mQsExpanded && !mStackScrollerOverscrolling
		@@ -2250,7 +2250,13 @@ public class NotificationPanelViewController extends PanelViewController {
		int qsPanelBottomY = calculateQsBottomPosition(qsExpansionFraction);
		mScrimController.setQsPosition(qsExpansionFraction, qsPanelBottomY);
		setQSClippingBounds();

		// Only need to notify the notification stack when we're not in split screen mode. If we
		// do, then the notification panel starts scrolling along with the QS.
		if (!mShouldUseSplitNotificationShade) {
		mNotificationStackScrollLayoutController.setQsExpansionFraction(qsExpansionFraction);
		}

		mDepthController.setQsPanelExpansion(qsExpansionFraction);
		}