Merge "Clean up predictive_back_animate_bouncer flag" into main (03d36ec9) · Commits · e / os / android_frameworks_base

packages/SystemUI/aconfig/predictive_back.aconfig

+0 −7

Original line number	Diff line number	Diff line
		@@ -8,13 +8,6 @@ flag {
		bug: "327732946"
		}

		flag {
		name: "predictive_back_animate_bouncer"
		namespace: "systemui"
		description: "Enable Predictive Back Animation in Bouncer"
		bug: "327733487"
		}

		flag {
		name: "predictive_back_animate_dialogs"
		namespace: "systemui"

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -40,7 +40,6 @@ import static org.mockito.Mockito.when;

		import android.platform.test.annotations.DisableFlags;
		import android.platform.test.annotations.EnableFlags;
		import android.platform.test.annotations.RequiresFlagsEnabled;
		import android.platform.test.flag.junit.CheckFlagsRule;
		import android.platform.test.flag.junit.DeviceFlagsValueProvider;
		import android.testing.TestableLooper;
		@@ -610,7 +609,6 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase {
		}

		@Test
		@RequiresFlagsEnabled(com.android.systemui.Flags.FLAG_PREDICTIVE_BACK_ANIMATE_BOUNCER)
		public void testPredictiveBackCallback_registration() {
		/* verify that a predictive back callback is registered when the bouncer becomes visible */
		mBouncerExpansionCallback.onVisibilityChanged(true);
		@@ -625,7 +623,6 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase {
		}

		@Test
		@RequiresFlagsEnabled(com.android.systemui.Flags.FLAG_PREDICTIVE_BACK_ANIMATE_BOUNCER)
		public void testPredictiveBackCallback_invocationHidesBouncer() {
		mBouncerExpansionCallback.onVisibilityChanged(true);
		/* capture the predictive back callback during registration */
		@@ -643,7 +640,6 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase {
		}

		@Test
		@RequiresFlagsEnabled(com.android.systemui.Flags.FLAG_PREDICTIVE_BACK_ANIMATE_BOUNCER)
		public void testPredictiveBackCallback_noBackAnimationForFullScreenBouncer() {
		when(mKeyguardSecurityModel.getSecurityMode(anyInt()))
		.thenReturn(KeyguardSecurityModel.SecurityMode.SimPin);
		@@ -663,7 +659,6 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase {
		}

		@Test
		@RequiresFlagsEnabled(com.android.systemui.Flags.FLAG_PREDICTIVE_BACK_ANIMATE_BOUNCER)
		public void testPredictiveBackCallback_forwardsBackDispatches() {
		mBouncerExpansionCallback.onVisibilityChanged(true);
		/* capture the predictive back callback during registration */

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

+1 −4

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@ package com.android.systemui.statusbar.phone;

		import static android.view.WindowInsets.Type.navigationBars;

		import static com.android.systemui.Flags.predictiveBackAnimateBouncer;
		import static com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants.EXPANSION_HIDDEN;
		import static com.android.systemui.plugins.ActivityStarter.OnDismissAction;
		import static com.android.systemui.statusbar.phone.BiometricUnlockController.MODE_WAKE_AND_UNLOCK;
		@@ -328,7 +327,6 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
		private float mQsExpansion;

		final Set<KeyguardViewManagerCallback> mCallbacks = new HashSet<>();
		private boolean mIsBackAnimationEnabled;
		private final UdfpsOverlayInteractor mUdfpsOverlayInteractor;
		private final ActivityStarter mActivityStarter;

		@@ -434,7 +432,6 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
		.map(SysUIUnfoldComponent::getFoldAodAnimationController).orElse(null);
		mAlternateBouncerInteractor = alternateBouncerInteractor;
		mBouncerInteractor = bouncerInteractor;
		mIsBackAnimationEnabled = predictiveBackAnimateBouncer();
		mUdfpsOverlayInteractor = udfpsOverlayInteractor;
		mActivityStarter = activityStarter;
		mKeyguardTransitionInteractor = keyguardTransitionInteractor;
		@@ -630,7 +627,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb

		private boolean shouldPlayBackAnimation() {
		// Suppress back animation when bouncer shouldn't be dismissed on back invocation.
		return !needsFullscreenBouncer() && mIsBackAnimationEnabled;
		return !needsFullscreenBouncer();
		}

		@Override