diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-02-28 20:10:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-02-28 20:10:09 +0000 |
| commit | c06a7e137da091e852e7ca38c0d015fc8c690aa8 (patch) | |
| tree | 461aab8c3868e0c4b30862dadead16a84e0cb1ce /quickstep | |
| parent | a655a4a83a1af6d182a769d29b3ba6acfb4880b5 (diff) | |
| parent | d82c5cd2b05b2260c6c600fe31cd4680e2307121 (diff) | |
| download | android_packages_apps_Trebuchet-c06a7e137da091e852e7ca38c0d015fc8c690aa8.tar.gz android_packages_apps_Trebuchet-c06a7e137da091e852e7ca38c0d015fc8c690aa8.tar.bz2 android_packages_apps_Trebuchet-c06a7e137da091e852e7ca38c0d015fc8c690aa8.zip | |
Merge "Set disabled state when getting new icon from DrawableFactory." into ub-launcher3-master
Diffstat (limited to 'quickstep')
| -rw-r--r-- | quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java index 5259e04a2..a5af1735b 100644 --- a/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java +++ b/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java @@ -500,10 +500,8 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag mFloatingView = new View(mLauncher); if (isBubbleTextView && v.getTag() instanceof ItemInfoWithIcon ) { // Create a copy of the app icon - ItemInfoWithIcon info = (ItemInfoWithIcon) v.getTag(); - FastBitmapDrawable d = DrawableFactory.get(mLauncher).newIcon(info); - d.setIsDisabled(info.isDisabled()); - mFloatingView.setBackground(d); + mFloatingView.setBackground( + DrawableFactory.get(mLauncher).newIcon((ItemInfoWithIcon) v.getTag())); } // Position the floating view exactly on top of the original |