Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Removing legacy default thumbnail logic." into oc-dev

Browse Source 
am: a0e44e7335

Change-Id: I5bcc319b92c464c28ff4db6c94cf297e786b50d7
This commit is contained in:
Winson Chung
2017-06-09 17:56:26 +00:00
committed by android-build-merger
parent 02ece2f486 a0e44e7335
commit fc926a938e
1 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java
View File

@@ -100,7 +100,6 @@ class BackgroundTaskLoader implements Runnable {
TaskResourceLoadQueue mLoadQueue; TaskResourceLoadQueue mLoadQueue;
TaskKeyLruCache<Drawable> mIconCache; TaskKeyLruCache<Drawable> mIconCache;
Bitmap mDefaultThumbnail;
BitmapDrawable mDefaultIcon; BitmapDrawable mDefaultIcon;
boolean mStarted; boolean mStarted;
@@ -111,11 +110,10 @@ class BackgroundTaskLoader implements Runnable {
/** Constructor, creates a new loading thread that loads task resources in the background */ /** Constructor, creates a new loading thread that loads task resources in the background */
public BackgroundTaskLoader(TaskResourceLoadQueue loadQueue, public BackgroundTaskLoader(TaskResourceLoadQueue loadQueue,
TaskKeyLruCache<Drawable> iconCache, Bitmap defaultThumbnail, TaskKeyLruCache<Drawable> iconCache, BitmapDrawable defaultIcon,
BitmapDrawable defaultIcon, OnIdleChangedListener onIdleChangedListener) { OnIdleChangedListener onIdleChangedListener) {
mLoadQueue = loadQueue; mLoadQueue = loadQueue;
mIconCache = iconCache; mIconCache = iconCache;
mDefaultThumbnail = defaultThumbnail;
mDefaultIcon = defaultIcon; mDefaultIcon = defaultIcon;
mMainThreadHandler = new Handler(); mMainThreadHandler = new Handler();
mOnIdleChangedListener = onIdleChangedListener; mOnIdleChangedListener = onIdleChangedListener;
@@ -230,18 +228,14 @@ class BackgroundTaskLoader implements Runnable {
} }
if (DEBUG) Log.d(TAG, "Loading thumbnail: " + t.key); if (DEBUG) Log.d(TAG, "Loading thumbnail: " + t.key);
final ThumbnailData cachedThumbnailData = ssp.getTaskThumbnail(t.key.id, final ThumbnailData thumbnailData = ssp.getTaskThumbnail(t.key.id,
true /* reducedResolution */); true /* reducedResolution */);
if (cachedThumbnailData.thumbnail == null) {
cachedThumbnailData.thumbnail = mDefaultThumbnail;
}
if (!mCancelled) { if (!mCancelled) {
// Notify that the task data has changed // Notify that the task data has changed
final Drawable finalIcon = cachedIcon; final Drawable finalIcon = cachedIcon;
mMainThreadHandler.post( mMainThreadHandler.post(
() -> t.notifyTaskDataLoaded(cachedThumbnailData, finalIcon)); () -> t.notifyTaskDataLoaded(thumbnailData, finalIcon));
} }
} }
} }
@@ -282,7 +276,6 @@ public class RecentsTaskLoader {
int mDefaultTaskBarBackgroundColor; int mDefaultTaskBarBackgroundColor;
int mDefaultTaskViewBackgroundColor; int mDefaultTaskViewBackgroundColor;
BitmapDrawable mDefaultIcon; BitmapDrawable mDefaultIcon;
Bitmap mDefaultThumbnail;
private TaskKeyLruCache.EvictionCallback mClearActivityInfoOnEviction = private TaskKeyLruCache.EvictionCallback mClearActivityInfoOnEviction =
new TaskKeyLruCache.EvictionCallback() { new TaskKeyLruCache.EvictionCallback() {
@@ -304,15 +297,10 @@ public class RecentsTaskLoader {
mMaxIconCacheSize = res.getInteger(R.integer.config_recents_max_icon_count); mMaxIconCacheSize = res.getInteger(R.integer.config_recents_max_icon_count);
int iconCacheSize = RecentsDebugFlags.Static.DisableBackgroundCache ? 1 : int iconCacheSize = RecentsDebugFlags.Static.DisableBackgroundCache ? 1 :
mMaxIconCacheSize; mMaxIconCacheSize;
int thumbnailCacheSize = RecentsDebugFlags.Static.DisableBackgroundCache ? 1 :
mMaxThumbnailCacheSize;
// Create the default assets // Create the default assets
Bitmap icon = Bitmap.createBitmap(1, 1, Bitmap.Config.ALPHA_8); Bitmap icon = Bitmap.createBitmap(1, 1, Bitmap.Config.ALPHA_8);
icon.eraseColor(0); icon.eraseColor(0);
mDefaultThumbnail = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888);
mDefaultThumbnail.setHasAlpha(false);
mDefaultThumbnail.eraseColor(0xFFffffff);
mDefaultIcon = new BitmapDrawable(context.getResources(), icon); mDefaultIcon = new BitmapDrawable(context.getResources(), icon);
// Initialize the proxy, cache and loaders // Initialize the proxy, cache and loaders
@@ -325,7 +313,7 @@ public class RecentsTaskLoader {
mContentDescriptionCache = new TaskKeyLruCache<>(numRecentTasks, mContentDescriptionCache = new TaskKeyLruCache<>(numRecentTasks,
mClearActivityInfoOnEviction); mClearActivityInfoOnEviction);
mActivityInfoCache = new LruCache(numRecentTasks); mActivityInfoCache = new LruCache(numRecentTasks);
mLoader = new BackgroundTaskLoader(mLoadQueue, mIconCache, mDefaultThumbnail, mDefaultIcon, mLoader = new BackgroundTaskLoader(mLoadQueue, mIconCache, mDefaultIcon,
mHighResThumbnailLoader::setTaskLoadQueueIdle); mHighResThumbnailLoader::setTaskLoadQueueIdle);
} }