From 2283fc2c85e9fde2c7da43d1b3c8c3789e692bb2 Mon Sep 17 00:00:00 2001
From: Beverly <beverlyt@google.com>
Date: Thu, 15 Dec 2022 20:13:53 +0000
Subject: [PATCH] Move active unlock chipbar flag to a ResourceFlag

So that different devices can override the resource

Test: manually check flagFlipper app on different devices
Bug: 260876265
Change-Id: I25ba5a5d64c80faf22d5a70d98e441ab8fae0a5c
---
 packages/SystemUI/res/values/flags.xml                    | 3 +++
 packages/SystemUI/src/com/android/systemui/flags/Flags.kt | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/res/values/flags.xml b/packages/SystemUI/res/values/flags.xml
index fd2e3249d59ac..c5ffc94d01af6 100644
--- a/packages/SystemUI/res/values/flags.xml
+++ b/packages/SystemUI/res/values/flags.xml
@@ -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
diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt
index efb513d57db6a..9f4e7e2ef76ec 100644
--- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt
+++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt
@@ -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