Merge "Clean up aconfig flag instant_hide_shade." into main (3d489818) · Commits · e / os / android_frameworks_base

packages/SystemUI/aconfig/systemui.aconfig

+0 −10

Original line number	Diff line number	Diff line
		@@ -1993,16 +1993,6 @@ flag {
		bug: "418243972"
		}

		flag {
		name: "instant_hide_shade"
		namespace: "systemui"
		description: "Enables the Shade to hide instantaneously at the end of a launch animation, preventing flickers."
		bug: "419304171"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "dream_preview_tap_dismiss"
		namespace: "systemui"

+1 −3

Original line number	Diff line number	Diff line
		@@ -63,7 +63,6 @@ import com.android.internal.annotations.VisibleForTesting
		import com.android.internal.policy.ScreenDecorationsUtils
		import com.android.systemui.Flags.animationLibraryDelayLeashCleanup
		import com.android.systemui.Flags.animationLibraryShellMigration
		import com.android.systemui.Flags.instantHideShade
		import com.android.systemui.Flags.moveTransitionAnimationLayer
		import com.android.systemui.animation.TransitionAnimator.Companion.toTransitionState
		import com.android.wm.shell.shared.IShellTransitions
		@@ -2343,7 +2342,6 @@ constructor(

		override fun onTransitionAnimationEnd(isExpandingFullyAbove: Boolean) {
		listener?.onTransitionAnimationEnd()
		if (!instantHideShade()) onAnimationFinished()

		if (reparent) {
		val cleanUpTransitionLeash: () -> Unit = {
		@@ -2392,7 +2390,7 @@ constructor(
		}
		delegate.onTransitionAnimationEnd(isExpandingFullyAbove)

		if (instantHideShade()) onAnimationFinished()
		onAnimationFinished()
		}

		override fun onTransitionAnimationProgress(

+0 −3

Original line number	Diff line number	Diff line
		@@ -53,7 +53,6 @@ import android.view.WindowManager;
		import androidx.test.filters.SmallTest;

		import com.android.internal.colorextraction.ColorExtractor;
		import com.android.systemui.Flags;
		import com.android.systemui.SysuiTestCase;
		import com.android.systemui.biometrics.AuthController;
		import com.android.systemui.colorextraction.SysuiColorExtractor;
		@@ -547,7 +546,6 @@ public class NotificationShadeWindowControllerImplTest extends SysuiTestCase {
		assertThat(lp.preferredMinDisplayRefreshRate).isEqualTo(0);
		}

		@EnableFlags(Flags.FLAG_INSTANT_HIDE_SHADE)
		@Test
		public void afterActivityLaunch_rootViewInvisible() {
		// GIVEN the panel is visible
		@@ -562,7 +560,6 @@ public class NotificationShadeWindowControllerImplTest extends SysuiTestCase {
		verify(mNotificationShadeWindowView).setVisibility(eq(View.INVISIBLE));
		}

		@EnableFlags(Flags.FLAG_INSTANT_HIDE_SHADE)
		@Test
		public void setKeyguardFadingAway_doesNothing_whenForceHidden() {
		// GIVEN the panel is visible force-hidden at the end of an activity launch

+0 −3

Original line number	Diff line number	Diff line
		@@ -16,14 +16,12 @@

		package com.android.systemui.shade

		import android.platform.test.annotations.EnableFlags
		import android.testing.TestableLooper.RunWithLooper
		import android.view.Display
		import android.view.WindowManager
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.internal.statusbar.IStatusBarService
		import com.android.systemui.Flags
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.assist.AssistManager
		import com.android.systemui.flags.DisableSceneContainer
		@@ -197,7 +195,6 @@ class ShadeControllerImplTest : SysuiTestCase() {
		assertThat(windowRootViewVisibilityInteractor.isLockscreenOrShadeVisible.value).isFalse()
		}

		@EnableFlags(Flags.FLAG_INSTANT_HIDE_SHADE)
		@Test
		fun visible_launchAnimationEnds_windowControllerInstantlyHidden() {
		// GIVEN the shade is currently expanded

+4 −7

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package com.android.systemui.shade

		import com.android.keyguard.KeyguardViewController
		import com.android.systemui.Flags
		import com.android.systemui.assist.AssistManager
		import com.android.systemui.statusbar.CommandQueue
		import com.android.systemui.statusbar.NotificationPresenter
		@@ -75,12 +74,10 @@ abstract class BaseShadeControllerImpl(
		onClosingFinished()
		}
		if (launchIsFullScreen) {
		if (Flags.instantHideShade()) {
		// Make sure that visually the Shade is gone immediately, even though the rest of
		// the state takes a little time to catch up.
		// Make sure that visually the Shade is gone immediately, even though the rest of the
		// state takes a little time to catch up.
		notificationShadeWindowController.setPanelVisible(false)
		notificationShadeWindowController.setForceHideAfterActivityLaunch(true)
		}
		instantCollapseShade()
		}
		}