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

Commit 526f8a00 authored by Stefan Andonian's avatar Stefan Andonian
Browse files

Remove cyclical dependency from LauncherPrefs. 

ag/26260351 was a much larger CL that removed more pieces of
LauncherPrefs that were related to this flag and were unused.
Unfortunately, that CL caused a test regression, and so I am publishing
this much smaller change in an effort to resolve the underlying issue in
a timely manner.

Bug: 324670265
Test: Installed this on a device and tested that nothing was broken.
Flag: NA
Change-Id: I10be75a1278fdffe7cc01beecf37b967526c4bc4
parent 4b127628

src/com/android/launcher3/LauncherPrefs.kt

+3 −4
Original line number Diff line number Diff line
@@ -349,8 +349,8 @@ class LauncherPrefs(private val encryptedContext: Context) { 
        @JvmField

        val PRIVATE_SPACE_APPS =

            nonRestorableItem("pref_private_space_apps", 0, EncryptionType.MOVE_TO_DEVICE_PROTECTED)

        @JvmField val ENABLE_TWOLINE_ALLAPPS_TOGGLE =

                backedUpItem("pref_enable_two_line_toggle", false)

        @JvmField

        val ENABLE_TWOLINE_ALLAPPS_TOGGLE = backedUpItem("pref_enable_two_line_toggle", false)

        @JvmField

        val THEMED_ICONS =

            backedUpItem(Themes.KEY_THEMED_ICONS, false, EncryptionType.MOVE_TO_DEVICE_PROTECTED)
@@ -494,8 +494,7 @@ class LauncherPrefs(private val encryptedContext: Context) { 
}



// It is a var because the unit tests are setting this to true so they can run.

var moveStartupDataToDeviceProtectedStorageIsEnabled: Boolean =

    com.android.launcher3.config.FeatureFlags.MOVE_STARTUP_DATA_TO_DEVICE_PROTECTED_STORAGE.get()

var moveStartupDataToDeviceProtectedStorageIsEnabled: Boolean = false



private val ITEMS_TO_MOVE_TO_DEVICE_PROTECTED_STORAGE: MutableSet<ConstantItem<*>> = mutableSetOf()