From 3e64dabb46c11f6796a66d84c87d568a76942831 Mon Sep 17 00:00:00 2001 From: Priyanka Advani Date: Mon, 4 Mar 2024 18:07:59 +0000 Subject: [PATCH] Revert "Remove cyclical dependency from LauncherPrefs." This reverts commit 526f8a0099cdb2da107f5451abfd274de407433e. Reason for revert: culprit for b/328063858. Will be running through ABTD for verification and before submitting the revert. Change-Id: Ie439b2d661617f10bbc31afada187a313dd52af7 --- src/com/android/launcher3/LauncherPrefs.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/com/android/launcher3/LauncherPrefs.kt b/src/com/android/launcher3/LauncherPrefs.kt index bd085bf3ff..b0a644b269 100644 --- a/src/com/android/launcher3/LauncherPrefs.kt +++ b/src/com/android/launcher3/LauncherPrefs.kt @@ -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> = mutableSetOf()