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

Commit 28a06cc6 authored by Matt Pietal's avatar Matt Pietal
Browse files

Clean up some released/obsolete flags 

All lockscreen related

Bug: 255607168
Bug: 297365780
Test: atest SystemUITests
Flag: EXEMPT code cleanup
Change-Id: Ic07a26c0d8d75dc45f1f42cf84b9827a062e4344
parent 8e6240de

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

+0 −3
Original line number Diff line number Diff line
@@ -232,7 +232,6 @@ class KeyguardPinViewControllerTest : SysuiTestCase() { 
    @Test

    fun testOnViewAttached_withAutoPinConfirmationFailedPasswordAttemptsLessThan5() {

        val pinViewController = constructPinViewController(mockKeyguardPinView)

        `when`(featureFlags.isEnabled(Flags.AUTO_PIN_CONFIRMATION)).thenReturn(true)

        `when`(lockPatternUtils.getPinLength(anyInt())).thenReturn(6)

        `when`(lockPatternUtils.isAutoPinConfirmEnabled(anyInt())).thenReturn(true)

        `when`(lockPatternUtils.getCurrentFailedPasswordAttempts(anyInt())).thenReturn(3)
@@ -249,7 +248,6 @@ class KeyguardPinViewControllerTest : SysuiTestCase() { 
    @Test

    fun testOnViewAttached_withAutoPinConfirmationFailedPasswordAttemptsMoreThan5() {

        val pinViewController = constructPinViewController(mockKeyguardPinView)

        `when`(featureFlags.isEnabled(Flags.AUTO_PIN_CONFIRMATION)).thenReturn(true)

        `when`(lockPatternUtils.getPinLength(anyInt())).thenReturn(6)

        `when`(lockPatternUtils.isAutoPinConfirmEnabled(anyInt())).thenReturn(true)

        `when`(lockPatternUtils.getCurrentFailedPasswordAttempts(anyInt())).thenReturn(6)
@@ -275,7 +273,6 @@ class KeyguardPinViewControllerTest : SysuiTestCase() { 
    @Test

    fun onUserInput_autoConfirmation_attemptsUnlock() {

        val pinViewController = constructPinViewController(mockKeyguardPinView)

        whenever(featureFlags.isEnabled(Flags.AUTO_PIN_CONFIRMATION)).thenReturn(true)

        whenever(lockPatternUtils.getPinLength(anyInt())).thenReturn(6)

        whenever(lockPatternUtils.isAutoPinConfirmEnabled(anyInt())).thenReturn(true)

        whenever(passwordTextView.text).thenReturn("000000")

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

+2 −5
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import com.android.keyguard.domain.interactor.KeyguardKeyboardInteractor; 
import com.android.systemui.bouncer.ui.helper.BouncerHapticPlayer;

import com.android.systemui.classifier.FalsingCollector;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.flags.Flags;

import com.android.systemui.res.R;

import com.android.systemui.statusbar.policy.DevicePostureController;

import com.android.systemui.user.domain.interactor.SelectedUserInteractor;
@@ -93,11 +92,9 @@ public class KeyguardPinViewController 
        mPasswordEntry.setUserActivityListener(this::onUserInput);

        mView.onDevicePostureChanged(mPostureController.getDevicePosture());

        mPostureController.addCallback(mPostureCallback);

        if (mFeatureFlags.isEnabled(Flags.AUTO_PIN_CONFIRMATION)) {

        mPasswordEntry.setUsePinShapes(true);

        updateAutoConfirmationState();

    }

    }



    protected void onUserInput() {

        super.onUserInput();

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

+0 −15
Original line number Diff line number Diff line
@@ -76,21 +76,10 @@ object Flags { 
    val LOCKSCREEN_CUSTOM_CLOCKS =

        resourceBooleanFlag(R.bool.config_enableLockScreenCustomClocks, "lockscreen_custom_clocks")



    /**

     * Migration from the legacy isDozing/dozeAmount paths to the new KeyguardTransitionRepository

     * will occur in stages. This is one stage of many to come.

     */

    // TODO(b/255607168): Tracking Bug

    @JvmField val DOZING_MIGRATION_1 = unreleasedFlag("dozing_migration_1")



    /** Flag to control the revamp of keyguard biometrics progress animation */

    // TODO(b/244313043): Tracking bug

    @JvmField val BIOMETRICS_ANIMATION_REVAMP = unreleasedFlag("biometrics_animation_revamp")



    // flag for controlling auto pin confirmation and material u shapes in bouncer

    @JvmField

    val AUTO_PIN_CONFIRMATION = releasedFlag("auto_pin_confirmation", "auto_pin_confirmation")



    /** Enables code to show contextual loyalty cards in wallet entrypoints */

    // TODO(b/294110497): Tracking Bug

    @JvmField
@@ -100,10 +89,6 @@ object Flags { 
    // TODO(b/242908637): Tracking Bug

    @JvmField val WALLPAPER_FULLSCREEN_PREVIEW = releasedFlag("wallpaper_fullscreen_preview")



    /** Inflate and bind views upon emitting a blueprint value . */

    // TODO(b/297365780): Tracking Bug

    @JvmField val LAZY_INFLATE_KEYGUARD = releasedFlag("lazy_inflate_keyguard")



    /** Enables UI updates for AI wallpapers in the wallpaper picker. */

    // TODO(b/267722622): Tracking Bug

    @JvmField val WALLPAPER_PICKER_UI_FOR_AIWP = releasedFlag("wallpaper_picker_ui_for_aiwp")