Merge "Revert "Micro-optimizations for qsFullScreen"" into main (df671d9c) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/shade/QuickSettingsControllerImpl.java

+7 −20

Original line number	Diff line number	Diff line
		@@ -207,11 +207,6 @@ public class QuickSettingsControllerImpl implements QuickSettingsController, Dum

		/** Indicates QS is at its max height */
		private boolean mFullyExpanded;
		/**
		* Indicates QS is at its maximum height, AND takes up the whole screen (i.e. not in split
		* shade).
		*/
		private boolean mFullScreen;
		private boolean mExpandedWhenExpandingStarted;
		private boolean mAnimatingHiddenFromCollapsed;
		private boolean mVisible;
		@@ -972,35 +967,27 @@ public class QuickSettingsControllerImpl implements QuickSettingsController, Dum
		}

		private void setQsFullScreen(boolean qsFullScreen) {
		if (mFullScreen == qsFullScreen) {
		return; // no change
		}
		mFullScreen = qsFullScreen;

		mShadeRepository.setLegacyQsFullscreen(qsFullScreen);
		mNotificationStackScrollLayoutController.setQsFullScreen(qsFullScreen);
		if (!SceneContainerFlag.isEnabled()) {
		mNotificationStackScrollLayoutController.setScrollingEnabled(
		mBarState != KEYGUARD && (!qsFullScreen \|\| mExpansionFromOverscroll));
		}
		}

		void updateQsState() {
		boolean qsExpanded = getExpanded();

		if (!FooterViewRefactor.isEnabled()) {
		// Update full screen state; note that this will be true if the QS panel is only
		// partially expanded, and that is fixed with the footer view refactor.
		setQsFullScreen(/* qsFullScreen = */ qsExpanded && !mSplitShadeEnabled);
		}

		if (!SceneContainerFlag.isEnabled()) {
		mNotificationStackScrollLayoutController.setScrollingEnabled(
		mBarState != KEYGUARD && (!mFullScreen \|\| mExpansionFromOverscroll));
		setQsFullScreen(/* qsFullScreen = */ getExpanded() && !mSplitShadeEnabled);
		}

		if (mQsStateUpdateListener != null) {
		mQsStateUpdateListener.onQsStateUpdated(qsExpanded, mStackScrollerOverscrolling);
		mQsStateUpdateListener.onQsStateUpdated(getExpanded(), mStackScrollerOverscrolling);
		}

		if (mQs == null) return;
		mQs.setExpanded(qsExpanded);
		mQs.setExpanded(getExpanded());
		}

		/** update expanded state of QS */