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

Commit 2ade8f20 authored by Priyanka Advani's avatar Priyanka Advani Committed by Android (Google) Code Review
Browse files

Merge "Revert "Remove cyclical dependency from LauncherPrefs."" into main

parents 95b55116 3e64dabb

src/com/android/launcher3/LauncherPrefs.kt

+4 −3
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,7 +494,8 @@ 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 = false

var moveStartupDataToDeviceProtectedStorageIsEnabled: Boolean =

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



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