Merge "Some cleanups in Workspace.java class 1. Make instance variables final 2. Get rid of explicit type arguments that can be inferred 3. Get rid of redundant initializer 4. Get rid of unnecessary ;" into ub-launcher3-dorval-polish
diff --git a/src/com/android/launcher3/shortcuts/ShortcutCache.java b/src/com/android/launcher3/shortcuts/ShortcutCache.java
index d4db96d..5742d1d 100644
--- a/src/com/android/launcher3/shortcuts/ShortcutCache.java
+++ b/src/com/android/launcher3/shortcuts/ShortcutCache.java
@@ -19,9 +19,8 @@
import android.annotation.TargetApi;
import android.os.Build;
import android.os.UserHandle;
+import android.util.ArrayMap;
import android.util.LruCache;
-
-import java.util.HashMap;
import java.util.List;
/**
@@ -31,18 +30,15 @@
*/
@TargetApi(Build.VERSION_CODES.N)
public class ShortcutCache {
- private static final String TAG = "ShortcutCache";
- private static final boolean LOGD = false;
-
private static final int CACHE_SIZE = 30; // Max number shortcuts we cache.
- private LruCache<ShortcutKey, ShortcutInfoCompat> mCachedShortcuts;
+ private final LruCache<ShortcutKey, ShortcutInfoCompat> mCachedShortcuts;
// We always keep pinned shortcuts in the cache.
- private HashMap<ShortcutKey, ShortcutInfoCompat> mPinnedShortcuts;
+ private final ArrayMap<ShortcutKey, ShortcutInfoCompat> mPinnedShortcuts;
public ShortcutCache() {
mCachedShortcuts = new LruCache<>(CACHE_SIZE);
- mPinnedShortcuts = new HashMap<>();
+ mPinnedShortcuts = new ArrayMap<>();
}
/**