diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2016-12-16 00:21:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-12-16 00:21:29 +0000 |
| commit | 338dee9dd7a7b087bf182f16970c16ffd940b435 (patch) | |
| tree | 77d2745acb0680c4f90fd9a4a89485f99006559a /src/com/android/launcher3/shortcuts/DeepShortcutView.java | |
| parent | 99d814e54b28efc8c8d8d6dec4bb036a380c3c3f (diff) | |
| parent | 1cd01b023acc123b771765b7297d8aaedac224e0 (diff) | |
| download | android_packages_apps_Trebuchet-338dee9dd7a7b087bf182f16970c16ffd940b435.tar.gz android_packages_apps_Trebuchet-338dee9dd7a7b087bf182f16970c16ffd940b435.tar.bz2 android_packages_apps_Trebuchet-338dee9dd7a7b087bf182f16970c16ffd940b435.zip | |
Merge "Ensuring that ShortcutInfo always has an icon" into ub-launcher3-master
Diffstat (limited to 'src/com/android/launcher3/shortcuts/DeepShortcutView.java')
| -rw-r--r-- | src/com/android/launcher3/shortcuts/DeepShortcutView.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/com/android/launcher3/shortcuts/DeepShortcutView.java b/src/com/android/launcher3/shortcuts/DeepShortcutView.java index e7fc41512..679613789 100644 --- a/src/com/android/launcher3/shortcuts/DeepShortcutView.java +++ b/src/com/android/launcher3/shortcuts/DeepShortcutView.java @@ -26,9 +26,7 @@ import android.util.AttributeSet; import android.view.View; import android.widget.FrameLayout; -import com.android.launcher3.IconCache; import com.android.launcher3.Launcher; -import com.android.launcher3.LauncherAppState; import com.android.launcher3.LogAccelerateInterpolator; import com.android.launcher3.R; import com.android.launcher3.ShortcutInfo; @@ -95,8 +93,7 @@ public class DeepShortcutView extends FrameLayout implements ValueAnimator.Anima /** package private **/ void applyShortcutInfo(UnbadgedShortcutInfo info, DeepShortcutsContainer container) { mInfo = info; - IconCache cache = LauncherAppState.getInstance().getIconCache(); - mBubbleText.applyFromShortcutInfo(info, cache); + mBubbleText.applyFromShortcutInfo(info); mIconView.setBackground(mBubbleText.getIcon()); // Use the long label as long as it exists and fits. |