diff options
| author | Tony Wickham <twickham@google.com> | 2016-12-08 22:27:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-12-08 22:27:41 +0000 |
| commit | 0c87e735e114cdd7b293daa19ba7473e68d8ae9d (patch) | |
| tree | 08c964cc8293d2d389180776f0ddbc543b5049de /src/com/android/launcher3 | |
| parent | 72169102dbc0ab57802db1720cf325a57c19f930 (diff) | |
| parent | e391bd5a9acfbe08edac56fe2f3c3c21b2b8cb51 (diff) | |
| download | android_packages_apps_Trebuchet-0c87e735e114cdd7b293daa19ba7473e68d8ae9d.tar.gz android_packages_apps_Trebuchet-0c87e735e114cdd7b293daa19ba7473e68d8ae9d.tar.bz2 android_packages_apps_Trebuchet-0c87e735e114cdd7b293daa19ba7473e68d8ae9d.zip | |
Merge "Set PreloadIconDrawable disabled = false when restore is complete" into ub-launcher3-master
Diffstat (limited to 'src/com/android/launcher3')
| -rw-r--r-- | src/com/android/launcher3/PreloadIconDrawable.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/launcher3/PreloadIconDrawable.java b/src/com/android/launcher3/PreloadIconDrawable.java index efc0eaca2..973e688d9 100644 --- a/src/com/android/launcher3/PreloadIconDrawable.java +++ b/src/com/android/launcher3/PreloadIconDrawable.java @@ -177,8 +177,9 @@ public class PreloadIconDrawable extends Drawable { // Set the paint color only when the level changes, so that the dominant color // is only calculated when needed. mPaint.setColor(getIndicatorColor()); - } else if (mIcon instanceof FastBitmapDrawable) { - ((FastBitmapDrawable) mIcon).setIsDisabled(true); + } + if (mIcon instanceof FastBitmapDrawable) { + ((FastBitmapDrawable) mIcon).setIsDisabled(level < 100); } invalidateSelf(); |