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

Commit 4bd1f6be authored by Catherine Liang's avatar Catherine Liang
Browse files

Remove Wallpaper Picker revamped UI flag (3/3) 

Bug: 262780002
Test: manually verified
Change-Id: Ib00d1a5ec9b17d1cd2fa27dc5e090a6291773f7c
parent 66a3ebc8

packages/SystemUI/customization/src/com/android/systemui/shared/customization/data/content/CustomizationProviderContract.kt

+0 −3
Original line number Diff line number Diff line
@@ -163,9 +163,6 @@ object CustomizationProviderContract { 
        const val TABLE_NAME = "flags"

        val URI: Uri = BASE_URI.buildUpon().path(TABLE_NAME).build()



        /** Flag denoting whether the Wallpaper Picker should use the new, revamped UI. */

        const val FLAG_NAME_REVAMPED_WALLPAPER_UI = "revamped_wallpaper_ui"



        /**

         * Flag denoting whether the customizable lock screen quick affordances feature is enabled.

         */

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

+0 −3
Original line number Diff line number Diff line
@@ -188,9 +188,6 @@ object Flags { 
    // TODO(b/244313043): Tracking bug

    @JvmField val BIOMETRICS_ANIMATION_REVAMP = unreleasedFlag("biometrics_animation_revamp")



    // TODO(b/262780002): Tracking Bug

    @JvmField val REVAMPED_WALLPAPER_UI = releasedFlag("revamped_wallpaper_ui")



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

    @JvmField

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

packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardLongPressInteractor.kt

+0 −1
Original line number Diff line number Diff line
@@ -172,7 +172,6 @@ constructor( 


    private fun isFeatureEnabled(): Boolean {

        return featureFlags.isEnabled(Flags.LOCK_SCREEN_LONG_PRESS_ENABLED) &&

            featureFlags.isEnabled(Flags.REVAMPED_WALLPAPER_UI) &&

            appContext.resources.getBoolean(R.bool.long_press_keyguard_customize_lockscreen_enabled)

    }

packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractor.kt

+0 −4
Original line number Diff line number Diff line
@@ -379,10 +379,6 @@ constructor( 


    suspend fun getPickerFlags(): List<KeyguardPickerFlag> {

        return listOf(

            KeyguardPickerFlag(

                name = Contract.FlagsTable.FLAG_NAME_REVAMPED_WALLPAPER_UI,

                value = featureFlags.isEnabled(Flags.REVAMPED_WALLPAPER_UI),

            ),

            KeyguardPickerFlag(

                name = Contract.FlagsTable.FLAG_NAME_CUSTOM_LOCK_SCREEN_QUICK_AFFORDANCES_ENABLED,

                value =

packages/SystemUI/tests/src/com/android/systemui/keyguard/CustomizationProviderTest.kt

+0 −1
Original line number Diff line number Diff line
@@ -172,7 +172,6 @@ class CustomizationProviderTest : SysuiTestCase() { 
        val featureFlags =

            FakeFeatureFlags().apply {

                set(Flags.LOCKSCREEN_CUSTOM_CLOCKS, true)

                set(Flags.REVAMPED_WALLPAPER_UI, true)

                set(Flags.WALLPAPER_FULLSCREEN_PREVIEW, true)

                set(Flags.FACE_AUTH_REFACTOR, true)

            }