Adding LongArrayMap as a replacement for HashMap<Long, E>
Change-Id: I4710e6db69abcdbd897a8401fc8b980c09e2ffef
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 7220e02..b936c1f 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -100,6 +100,7 @@
import com.android.launcher3.compat.LauncherAppsCompat;
import com.android.launcher3.compat.UserHandleCompat;
import com.android.launcher3.compat.UserManagerCompat;
+import com.android.launcher3.util.LongArrayMap;
import com.android.launcher3.util.Thunk;
import com.android.launcher3.widget.PendingAddWidgetInfo;
import com.android.launcher3.widget.WidgetsContainerView;
@@ -302,7 +303,7 @@
@Thunk static LocaleConfiguration sLocaleConfiguration = null;
- private static HashMap<Long, FolderInfo> sFolders = new HashMap<Long, FolderInfo>();
+ private static LongArrayMap<FolderInfo> sFolders = new LongArrayMap<>();
private View.OnTouchListener mHapticFeedbackTouchListener;
@@ -3886,7 +3887,7 @@
/**
* Implementation of the method from LauncherModel.Callbacks.
*/
- public void bindFolders(final HashMap<Long, FolderInfo> folders) {
+ public void bindFolders(final LongArrayMap<FolderInfo> folders) {
Runnable r = new Runnable() {
public void run() {
bindFolders(folders);
@@ -3895,8 +3896,7 @@
if (waitUntilResume(r)) {
return;
}
- sFolders.clear();
- sFolders.putAll(folders);
+ sFolders = folders.clone();
}
/**