commit dfc628dabbf364473118d0f2d0332fc4f025c285
author Stefan Andonian <andonian@google.com> Thu Sep 28 18:59:14 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 28 18:59:14 2023 +0000
tree 2f379bb2bd0b2c9f22c73a2607acbb2e6d748a36
parent e34b94f5b9445e007b2fd468cab4f6963f269492
parent 939d5f876b6bb0bfe550c591e9f07be4ce44b9b1

Merge "Make exception for TASKBAR_PINNING so it is boot aware." into main

src/com/android/launcher3/LauncherPrefs.kt

diff --git a/src/com/android/launcher3/LauncherPrefs.kt b/src/com/android/launcher3/LauncherPrefs.kt
index 36d37c7..00bac1c 100644
--- a/src/com/android/launcher3/LauncherPrefs.kt
+++ b/src/com/android/launcher3/LauncherPrefs.kt
@@ -59,8 +59,12 @@
                 IS_STARTUP_DATA_MIGRATED.defaultValue
             )
 
+    // TODO: Remove `item == TASKBAR_PINNING` once isBootAwareStartupDataEnabled is always true
     private fun chooseSharedPreferences(item: Item): SharedPreferences =
-        if (isBootAwareStartupDataEnabled && item.isBootAware && isStartupDataMigrated)
+        if (
+            (isBootAwareStartupDataEnabled && item.isBootAware && isStartupDataMigrated) ||
+                item == TASKBAR_PINNING
+        )
             bootAwarePrefs
         else item.encryptedPrefs