Fix Custom app drawer labels lost after restarting #11

Signed-off-by: Saul Henriquez <[email protected]>
NeoApplications · Sep 29, 2020 · d2bf42b · d2bf42b
1 parent 5806038
commit d2bf42b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/Omega/src/com/saggitt/omega/OmegaPreferences.kt b/Omega/src/com/saggitt/omega/OmegaPreferences.kt
@@ -18,15 +18,14 @@
 package com.saggitt.omega
 
 import android.annotation.SuppressLint
-import android.content.ComponentName
 import android.content.Context
 import android.content.SharedPreferences
 import android.os.Looper
-import android.os.Process
 import android.text.TextUtils
 import com.android.launcher3.LauncherAppState
 import com.android.launcher3.LauncherFiles
 import com.android.launcher3.R
+import com.android.launcher3.Utilities.makeComponentKey
 import com.android.launcher3.allapps.search.DefaultAppSearchAlgorithm
 import com.android.launcher3.util.ComponentKey
 import com.android.launcher3.util.Executors
@@ -185,14 +184,14 @@ class OmegaPreferences(val context: Context) : SharedPreferences.OnSharedPrefere
 
     val customAppName = object : MutableMapPref<ComponentKey, String>("pref_appNameMap", reloadAll) {
         override fun flattenKey(key: ComponentKey) = key.toString()
-        override fun unflattenKey(key: String) = ComponentKey(ComponentName(context, key), Process.myUserHandle())
+        override fun unflattenKey(key: String) = makeComponentKey(context, key)
         override fun flattenValue(value: String) = value
         override fun unflattenValue(value: String) = value
     }
 
     val customAppIcon = object : MutableMapPref<ComponentKey, IconPackManager.CustomIconEntry>("pref_appIconMap", reloadAll) {
         override fun flattenKey(key: ComponentKey) = key.toString()
-        override fun unflattenKey(key: String) = ComponentKey(ComponentName(context, key), Process.myUserHandle())
+        override fun unflattenKey(key: String) = makeComponentKey(context, key)
         override fun flattenValue(value: IconPackManager.CustomIconEntry) = value.toString()
         override fun unflattenValue(value: String) = IconPackManager.CustomIconEntry.fromString(value)
     }

diff --git a/src/com/android/launcher3/WorkspaceItemInfo.java b/src/com/android/launcher3/WorkspaceItemInfo.java
@@ -242,9 +242,9 @@ private void updateDatabase(Context context, boolean updateIcon, boolean reload)
     }
 
     public void onLoadCustomizations(String titleAlias, String swipeUpAction,
-                                     IconPackManager.CustomIconEntry customEntry, Bitmap icon) {
+                                     IconPackManager.CustomIconEntry customIcon, Bitmap icon) {
         customTitle = titleAlias;
-        customIconEntry = customEntry;
+        customIconEntry = customIcon;
         this.customIcon = icon;
         this.swipeUpAction = swipeUpAction;
     }