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

Commit 3e53925c authored by Charlie Anderson's avatar Charlie Anderson Committed by Android (Google) Code Review
Browse files

Merge "Change FIRST_LOAD_AFTER_RESTORE_KEY to be nonRestorableItem" into main

parents 65b735be ed98c48f

src/com/android/launcher3/LauncherPrefs.kt

+36 −44
Original line number Diff line number Diff line
@@ -303,11 +303,7 @@ class LauncherPrefs(private val encryptedContext: Context) { 
        const val SHOULD_SHOW_SMARTSPACE_KEY = "SHOULD_SHOW_SMARTSPACE_KEY"

        @JvmField

        val ICON_STATE =

            nonRestorableItem(

                    "pref_icon_shape_path",

                "",

                EncryptionType.MOVE_TO_DEVICE_PROTECTED

            )

            nonRestorableItem("pref_icon_shape_path", "", EncryptionType.MOVE_TO_DEVICE_PROTECTED)

        @JvmField

        val ALL_APPS_OVERVIEW_THRESHOLD =

            nonRestorableItem(
@@ -366,11 +362,7 @@ class LauncherPrefs(private val encryptedContext: Context) { 
            )

        @JvmField

        val PRIVATE_SPACE_APPS =

                nonRestorableItem(

                        "pref_private_space_apps",

                        0,

                        EncryptionType.MOVE_TO_DEVICE_PROTECTED

                )

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

        @JvmField

        val THEMED_ICONS =

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

        @JvmField

        val IS_FIRST_LOAD_AFTER_RESTORE =

            backedUpItem(

            nonRestorableItem(

                FIRST_LOAD_AFTER_RESTORE_KEY,

                false,

                EncryptionType.MOVE_TO_DEVICE_PROTECTED