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	Original line	Diff line number	Diff line
	@@ -1993,16 +1993,6 @@ flag {
	bug: "418243972"		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 {		flag {
	name: "dream_preview_tap_dismiss"		name: "dream_preview_tap_dismiss"
	namespace: "systemui"		namespace: "systemui"

packages/SystemUI/animation/src/com/android/systemui/animation/ActivityTransitionAnimator.kt

+1 −3

packages/SystemUI/multivalentTests/src/com/android/systemui/shade/NotificationShadeWindowControllerImplTest.java

+0 −3

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

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

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

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

packages/SystemUI/multivalentTests/src/com/android/systemui/shade/ShadeControllerImplTest.kt

+0 −3

packages/SystemUI/src/com/android/systemui/shade/BaseShadeControllerImpl.kt

+4 −7

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

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

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

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

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

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

	override fun onTransitionAnimationProgress(		override fun onTransitionAnimationProgress(