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

Commit 1a4a51f2 authored Dec 16, 2022 by Beverly Tai Committed by Automerger Merge Worker Dec 16, 2022

Merge "Move active unlock chipbar flag to a ResourceFlag" into tm-qpr-dev am:...

Merge "Move active unlock chipbar flag to a ResourceFlag" into tm-qpr-dev am: e22e3694 am: a7087608

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

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

parents 2849c0cf a7087608

packages/SystemUI/res/values/flags.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,9 @@

		<bool name="flag_charging_ripple">false</bool>

		<!-- Whether to show chipbar UI whenever the device is unlocked by ActiveUnlock. -->
		<bool name="flag_active_unlock_chipbar">true</bool>

		<bool name="flag_smartspace">false</bool>

		<!-- Whether the user switcher chip shows in the status bar. When true, the multi user

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -165,7 +165,9 @@ object Flags {

		/** Shows chipbar UI whenever the device is unlocked by ActiveUnlock (watch). */
		// TODO(b/256513609): Tracking Bug
		@JvmField val ACTIVE_UNLOCK_CHIPBAR = releasedFlag(217, "active_unlock_chipbar")
		@JvmField
		val ACTIVE_UNLOCK_CHIPBAR =
		resourceBooleanFlag(217, R.bool.flag_active_unlock_chipbar, "active_unlock_chipbar")

		/**
		* Migrates control of the LightRevealScrim's reveal effect and amount from legacy code to the