diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java index f9b6298b21..d97eac94fb 100644 --- a/src/com/android/launcher3/InvariantDeviceProfile.java +++ b/src/com/android/launcher3/InvariantDeviceProfile.java @@ -16,7 +16,6 @@ package com.android.launcher3; -import static com.android.launcher3.LauncherPrefs.GRID_NAME; import static com.android.launcher3.Utilities.dpiFromPx; import static com.android.launcher3.config.FeatureFlags.ENABLE_DEVICE_PROFILE_LOGGING; import static com.android.launcher3.config.FeatureFlags.ENABLE_TWO_PANEL_HOME; @@ -94,6 +93,8 @@ public class InvariantDeviceProfile { public static final int TYPE_MULTI_DISPLAY = 1; public static final int TYPE_TABLET = 2; + private static final String KEY_IDP_GRID_NAME = "idp_grid_name"; + private static final float ICON_SIZE_DEFINED_IN_APP_DP = 48; // Constants that affects the interpolation curve between statically defined device profile @@ -205,7 +206,8 @@ public class InvariantDeviceProfile { String gridName = getCurrentGridName(context); String newGridName = initGrid(context, gridName); if (!newGridName.equals(gridName)) { - LauncherPrefs.get(context).put(GRID_NAME, newGridName); + LauncherPrefs.getPrefs(context).edit().putString(KEY_IDP_GRID_NAME, newGridName) + .apply(); } new DeviceGridState(this).writeToPrefs(context); @@ -313,7 +315,7 @@ public class InvariantDeviceProfile { } public static String getCurrentGridName(Context context) { - return LauncherPrefs.get(context).get(GRID_NAME); + return LauncherPrefs.getPrefs(context).getString(KEY_IDP_GRID_NAME, null); } private String initGrid(Context context, String gridName) { @@ -453,8 +455,9 @@ public class InvariantDeviceProfile { public void setCurrentGrid(Context context, String gridName) { - LauncherPrefs.get(context).put(GRID_NAME, gridName); - MAIN_EXECUTOR.execute(() -> onConfigChanged(context.getApplicationContext())); + Context appContext = context.getApplicationContext(); + LauncherPrefs.getPrefs(appContext).edit().putString(KEY_IDP_GRID_NAME, gridName).apply(); + MAIN_EXECUTOR.execute(() -> onConfigChanged(appContext)); } private Object[] toModelState() { diff --git a/src/com/android/launcher3/LauncherPrefs.kt b/src/com/android/launcher3/LauncherPrefs.kt index befaa64d50..2e07e3022a 100644 --- a/src/com/android/launcher3/LauncherPrefs.kt +++ b/src/com/android/launcher3/LauncherPrefs.kt @@ -4,8 +4,6 @@ import android.content.Context import android.content.SharedPreferences import android.content.SharedPreferences.OnSharedPreferenceChangeListener import androidx.annotation.VisibleForTesting -import com.android.launcher3.LauncherFiles.DEVICE_PREFERENCES_KEY -import com.android.launcher3.LauncherFiles.SHARED_PREFERENCES_KEY import com.android.launcher3.allapps.WorkProfileManager import com.android.launcher3.model.DeviceGridState import com.android.launcher3.pm.InstallSessionHelper @@ -22,10 +20,11 @@ import com.android.launcher3.util.Themes class LauncherPrefs(private val context: Context) { /** Wrapper around `getInner` for a `ContextualItem` */ - fun get(item: ContextualItem): T = getInner(item, item.defaultValueFromContext(context)) + fun get(item: ContextualItem): T = + getInner(item, item.defaultValueFromContext(context)) /** Wrapper around `getInner` for an `Item` */ - fun get(item: ConstantItem): T = getInner(item, item.defaultValue) + fun get(item: ConstantItem): T = getInner(item, item.defaultValue) /** * Retrieves the value for an [Item] from [SharedPreferences]. It handles method typing via the @@ -33,11 +32,11 @@ class LauncherPrefs(private val context: Context) { * `String`, `Boolean`, `Float`, `Int`, `Long`, or `Set`. */ @Suppress("IMPLICIT_CAST_TO_ANY", "UNCHECKED_CAST") - private fun getInner(item: Item, default: T): T { + private fun getInner(item: Item, default: T): T { val sp = context.getSharedPreferences(item.sharedPrefFile, Context.MODE_PRIVATE) - return when (item.type) { - String::class.java -> sp.getString(item.sharedPrefKey, default as? String) + return when (default::class.java) { + String::class.java -> sp.getString(item.sharedPrefKey, default as String) Boolean::class.java, java.lang.Boolean::class.java -> sp.getBoolean(item.sharedPrefKey, default as Boolean) Int::class.java, @@ -46,10 +45,11 @@ class LauncherPrefs(private val context: Context) { java.lang.Float::class.java -> sp.getFloat(item.sharedPrefKey, default as Float) Long::class.java, java.lang.Long::class.java -> sp.getLong(item.sharedPrefKey, default as Long) - Set::class.java -> sp.getStringSet(item.sharedPrefKey, default as? Set) + Set::class.java -> sp.getStringSet(item.sharedPrefKey, default as Set) else -> throw IllegalArgumentException( - "item type: ${item.type}" + " is not compatible with sharedPref methods" + "item type: ${default::class.java}" + + " is not compatible with sharedPref methods" ) } as T @@ -224,36 +224,39 @@ class LauncherPrefs(private val context: Context) { backedUpItem(RestoreDbTask.RESTORED_DEVICE_TYPE, InvariantDeviceProfile.TYPE_PHONE) @JvmField val APP_WIDGET_IDS = backedUpItem(RestoreDbTask.APPWIDGET_IDS, "") @JvmField val OLD_APP_WIDGET_IDS = backedUpItem(RestoreDbTask.APPWIDGET_OLD_IDS, "") - @JvmField val GRID_NAME = ConstantItem("idp_grid_name", true, null, String::class.java) @JvmField val ALLOW_ROTATION = - backedUpItem(RotationHelper.ALLOW_ROTATION_PREFERENCE_KEY, Boolean::class.java) { + backedUpItem(RotationHelper.ALLOW_ROTATION_PREFERENCE_KEY) { RotationHelper.getAllowRotationDefaultValue(DisplayController.INSTANCE.get(it).info) } @VisibleForTesting @JvmStatic fun backedUpItem(sharedPrefKey: String, defaultValue: T): ConstantItem = - ConstantItem(sharedPrefKey, true, defaultValue) + ConstantItem(sharedPrefKey, LauncherFiles.SHARED_PREFERENCES_KEY, defaultValue) @JvmStatic fun backedUpItem( sharedPrefKey: String, - type: Class, defaultValueFromContext: (c: Context) -> T - ): ContextualItem = ContextualItem(sharedPrefKey, true, defaultValueFromContext, type) + ): ContextualItem = + ContextualItem( + sharedPrefKey, + LauncherFiles.SHARED_PREFERENCES_KEY, + defaultValueFromContext + ) @VisibleForTesting @JvmStatic fun nonRestorableItem(sharedPrefKey: String, defaultValue: T): ConstantItem = - ConstantItem(sharedPrefKey, false, defaultValue) + ConstantItem(sharedPrefKey, LauncherFiles.DEVICE_PREFERENCES_KEY, defaultValue) @Deprecated("Don't use shared preferences directly. Use other LauncherPref methods.") @JvmStatic fun getPrefs(context: Context): SharedPreferences { // Use application context for shared preferences, so we use single cached instance return context.applicationContext.getSharedPreferences( - SHARED_PREFERENCES_KEY, + LauncherFiles.SHARED_PREFERENCES_KEY, Context.MODE_PRIVATE ) } @@ -263,7 +266,7 @@ class LauncherPrefs(private val context: Context) { fun getDevicePrefs(context: Context): SharedPreferences { // Use application context for shared preferences, so we use a single cached instance return context.applicationContext.getSharedPreferences( - DEVICE_PREFERENCES_KEY, + LauncherFiles.DEVICE_PREFERENCES_KEY, Context.MODE_PRIVATE ) } @@ -272,26 +275,21 @@ class LauncherPrefs(private val context: Context) { abstract class Item { abstract val sharedPrefKey: String - abstract val isBackedUp: Boolean - abstract val type: Class<*> - val sharedPrefFile: String = if (isBackedUp) SHARED_PREFERENCES_KEY else DEVICE_PREFERENCES_KEY + abstract val sharedPrefFile: String fun to(value: T): Pair = Pair(this, value) } data class ConstantItem( override val sharedPrefKey: String, - override val isBackedUp: Boolean, - val defaultValue: T, - // The default value can be null. If so, the type needs to be explicitly stated, or else NPE - override val type: Class = defaultValue!!::class.java + override val sharedPrefFile: String, + val defaultValue: T ) : Item() data class ContextualItem( override val sharedPrefKey: String, - override val isBackedUp: Boolean, - private val defaultSupplier: (c: Context) -> T, - override val type: Class + override val sharedPrefFile: String, + private val defaultSupplier: (c: Context) -> T ) : Item() { private var default: T? = null diff --git a/tests/src/com/android/launcher3/LauncherPrefsTest.kt b/tests/src/com/android/launcher3/LauncherPrefsTest.kt index d40a7bcf8c..31e8d3099b 100644 --- a/tests/src/com/android/launcher3/LauncherPrefsTest.kt +++ b/tests/src/com/android/launcher3/LauncherPrefsTest.kt @@ -13,7 +13,7 @@ import org.junit.runner.RunWith private val TEST_BOOLEAN_ITEM = LauncherPrefs.nonRestorableItem("1", false) private val TEST_STRING_ITEM = LauncherPrefs.nonRestorableItem("2", "( ͡❛ ͜ʖ ͡❛)") private val TEST_INT_ITEM = LauncherPrefs.nonRestorableItem("3", -1) -private val TEST_CONTEXTUAL_ITEM = ContextualItem("4", true, { true }, Boolean::class.java) +private val TEST_CONTEXTUAL_ITEM = LauncherPrefs.backedUpItem("4") { true } @SmallTest @RunWith(AndroidJUnit4::class)