Merge "[CS] Remove unused bouncerShowingOverDream from CentralSurfaces." into main (03e31210) · Commits · e / os / android_frameworks_base

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

+2 −5

Original line number	Diff line number	Diff line
		@@ -3730,8 +3730,6 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump
		expand = true;
		mShadeLog.logEndMotionEvent("endMotionEvent: cancel while on keyguard",
		forceCancel, expand);
		} else if (mCentralSurfaces.isBouncerShowingOverDream()) {
		expand = false;
		} else {
		// If we get a cancel, put the shade back to the state it was in when the
		// gesture started
		@@ -4891,10 +4889,9 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump
		return false;
		}

		// Do not allow panel expansion if bouncer is scrimmed or showing over a dream,
		// Do not allow panel expansion if bouncer is scrimmed,
		// otherwise user would be able to pull down QS or expand the shade.
		if (mCentralSurfaces.isBouncerShowingScrimmed()
		\|\| mCentralSurfaces.isBouncerShowingOverDream()) {
		if (mCentralSurfaces.isBouncerShowingScrimmed()) {
		mShadeLog.logMotionEvent(event,
		"onTouch: ignore touch, bouncer scrimmed or showing over dream");
		return false;

+0 −2

Original line number	Diff line number	Diff line
		@@ -301,8 +301,6 @@ public interface CentralSurfaces extends Dumpable, LifecycleOwner {

		boolean isBouncerShowingScrimmed();

		boolean isBouncerShowingOverDream();

		void updateNotificationPanelTouchState();

		int getRotation();

+0 −1

Original line number	Diff line number	Diff line
		@@ -84,7 +84,6 @@ abstract class CentralSurfacesEmptyImpl : CentralSurfaces {
		override fun awakenDreams() {}
		override fun isBouncerShowing() = false
		override fun isBouncerShowingScrimmed() = false
		override fun isBouncerShowingOverDream() = false
		override fun updateNotificationPanelTouchState() {}
		override fun getRotation() = 0
		override fun setBarStateForTest(state: Int) {}

+1 −10

Original line number	Diff line number	Diff line
		@@ -388,7 +388,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces {
		*/
		protected int mState; // TODO: remove this. Just use StatusBarStateController
		protected boolean mBouncerShowing;
		private boolean mBouncerShowingOverDream;

		private final PhoneStatusBarPolicy mIconPolicy;

		@@ -2460,10 +2459,7 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces {
		*/
		@Override
		public boolean shouldKeyguardHideImmediately() {
		final boolean isScrimmedBouncer =
		mScrimController.getState() == ScrimState.BOUNCER_SCRIMMED;
		final boolean isBouncerOverDream = isBouncerShowingOverDream();
		return (isScrimmedBouncer \|\| isBouncerOverDream);
		return mScrimController.getState() == ScrimState.BOUNCER_SCRIMMED;
		}

		private void showBouncerOrLockScreenIfKeyguard() {
		@@ -3160,11 +3156,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces {
		return isBouncerShowing() && mStatusBarKeyguardViewManager.primaryBouncerNeedsScrimming();
		}

		@Override
		public boolean isBouncerShowingOverDream() {
		return mBouncerShowingOverDream;
		}

		// End Extra BaseStatusBarMethods.

		boolean isTransientShown() {