Merge "1. Replace use of java.util.HashMap with android.util.ArrayMap in ShortcutCache class 2. Get rid of unused constants from ShortcutCache class 3. Make instance variables final" into ub-launcher3-dorval-polish

This commit is contained in:
Rajeev Kumar
2017-06-12 19:57:48 +00:00
committed by Android (Google) Code Review
@@ -19,9 +19,8 @@ package com.android.launcher3.shortcuts;
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 @@ import java.util.List;
*/
@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<>();
}
/**