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

Commit 2ecde8de authored by Aaron Liu's avatar Aaron Liu Committed by Android (Google) Code Review
Browse files

Merge "Clean up BOUNCER_USER_SWITCHER flag" into main

parents a305de12 39d525b9

packages/SystemUI/multivalentTests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.kt

+0 −1
Original line number Diff line number Diff line
@@ -197,7 +197,6 @@ class KeyguardSecurityContainerControllerTest : SysuiTestCase() { 
        whenever(deviceProvisionedController.isUserSetup(anyInt())).thenReturn(true)



        featureFlags = FakeFeatureFlags()

        featureFlags.set(Flags.BOUNCER_USER_SWITCHER, false)

        featureFlags.set(Flags.KEYGUARD_WM_STATE_REFACTOR, false)

        featureFlags.set(Flags.REFACTOR_KEYGUARD_DISMISS_INTENT, false)

        featureFlags.set(Flags.LOCKSCREEN_ENABLE_LANDSCAPE, false)

packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java

+1 −1
Original line number Diff line number Diff line
@@ -1111,7 +1111,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 
    }



    private boolean canDisplayUserSwitcher() {

        return mFeatureFlags.isEnabled(Flags.BOUNCER_USER_SWITCHER);

        return getContext().getResources().getBoolean(R.bool.config_enableBouncerUserSwitcher);

    }



    private void configureMode() {

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

+0 −5
Original line number Diff line number Diff line
@@ -122,11 +122,6 @@ object Flags { 
    val NEW_UNLOCK_SWIPE_ANIMATION = releasedFlag("new_unlock_swipe_animation")

    val CHARGING_RIPPLE = resourceBooleanFlag(R.bool.flag_charging_ripple, "charging_ripple")



    // TODO(b/254512281): Tracking Bug

    @JvmField

    val BOUNCER_USER_SWITCHER =

        resourceBooleanFlag(R.bool.config_enableBouncerUserSwitcher, "bouncer_user_switcher")



    // TODO(b/254512676): Tracking Bug

    @JvmField

    val LOCKSCREEN_CUSTOM_CLOCKS =