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

Commit e22e3694 authored by Beverly Tai's avatar Beverly Tai Committed by Android (Google) Code Review
Browse files

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

parents a685426e 2283fc2c

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