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

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

Merge "RESTRICT AUTOMERGE Remove ACTIVE_UNLOCK chipbar flag" into tm-qpr-dev

parents 4f6472c6 065f435e

packages/SystemUI/res/values/flags.xml

+0 −3
Original line number Diff line number Diff line
@@ -30,9 +30,6 @@ 


    <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>



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

      avatar will no longer show on the lockscreen -->

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

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

+1 −8
Original line number Diff line number Diff line
@@ -157,12 +157,6 @@ object Flags { 
    val CUSTOMIZABLE_LOCK_SCREEN_QUICK_AFFORDANCES =

        unreleasedFlag(216, "customizable_lock_screen_quick_affordances", teamfood = true)



    /** Shows chipbar UI whenever the device is unlocked by ActiveUnlock (watch). */

    // TODO(b/256513609): Tracking Bug

    @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

     * new KeyguardTransitionRepository.
@@ -272,8 +266,7 @@ object Flags { 
    /** Enables new QS Edit Mode visual refresh */

    // TODO(b/269787742): Tracking Bug

    @JvmField

    val ENABLE_NEW_QS_EDIT_MODE =

        unreleasedFlag(510, "enable_new_qs_edit_mode", teamfood = false)

    val ENABLE_NEW_QS_EDIT_MODE = unreleasedFlag(510, "enable_new_qs_edit_mode", teamfood = false)



    // 600- status bar