Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4a947d0 authored Apr 27, 2023 by Aaron Liu Committed by Automerger Merge Worker Apr 27, 2023

Merge "Clean up async bouncer flag" into udc-dev am: cccaf576

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22894037

Change-Id: Id6bdf0c47dde0abcb138603cd4698c586873818b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 5f518a2a cccaf576

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -211,11 +211,6 @@ object Flags {
	"wallpaper_picker_ui_for_aiwp"		"wallpaper_picker_ui_for_aiwp"
	)		)

	/** Whether to inflate the bouncer view on a background thread. */
	// TODO(b/272091103): Tracking Bug
	@JvmField
	val ASYNC_INFLATE_BOUNCER = releasedFlag(229, "async_inflate_bouncer")

	/** Whether to inflate the bouncer view on a background thread. */		/** Whether to inflate the bouncer view on a background thread. */
	// TODO(b/273341787): Tracking Bug		// TODO(b/273341787): Tracking Bug
	@JvmField		@JvmField

packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.java

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -682,8 +682,7 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase {
	}		}

	@Test		@Test
	public void testReinflateViewFlipper_asyncBouncerFlagOn() {		public void testReinflateViewFlipper() {
	when(mFeatureFlags.isEnabled(Flags.ASYNC_INFLATE_BOUNCER)).thenReturn(true);
	KeyguardSecurityViewFlipperController.OnViewInflatedCallback onViewInflatedCallback =		KeyguardSecurityViewFlipperController.OnViewInflatedCallback onViewInflatedCallback =
	controller -> {		controller -> {
	};		};