diff options
Diffstat (limited to 'src/com/android/launcher3/popup')
-rw-r--r-- | src/com/android/launcher3/popup/PopupItemView.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/popup/PopupPopulator.java | 6 | ||||
-rw-r--r-- | src/com/android/launcher3/popup/SystemShortcut.java | 6 |
3 files changed, 5 insertions, 9 deletions
diff --git a/src/com/android/launcher3/popup/PopupItemView.java b/src/com/android/launcher3/popup/PopupItemView.java index a18f650c1..5ead971be 100644 --- a/src/com/android/launcher3/popup/PopupItemView.java +++ b/src/com/android/launcher3/popup/PopupItemView.java @@ -35,7 +35,7 @@ import android.widget.FrameLayout; import com.android.launcher3.LogAccelerateInterpolator; import com.android.launcher3.R; import com.android.launcher3.Utilities; -import com.android.launcher3.util.PillRevealOutlineProvider; +import com.android.launcher3.anim.PillRevealOutlineProvider; /** * An abstract {@link FrameLayout} that supports animating an item's content diff --git a/src/com/android/launcher3/popup/PopupPopulator.java b/src/com/android/launcher3/popup/PopupPopulator.java index 112889474..3ba4ebafd 100644 --- a/src/com/android/launcher3/popup/PopupPopulator.java +++ b/src/com/android/launcher3/popup/PopupPopulator.java @@ -297,14 +297,12 @@ public class PopupPopulator { if (mSystemShortcutChild instanceof DeepShortcutView) { // Expanded system shortcut, with both icon and text shown on white background. final DeepShortcutView shortcutView = (DeepShortcutView) mSystemShortcutChild; - shortcutView.getIconView().setBackground(mSystemShortcutInfo.getIcon(context, - android.R.attr.textColorTertiary)); + shortcutView.getIconView().setBackground(mSystemShortcutInfo.getIcon(context)); shortcutView.getBubbleText().setText(mSystemShortcutInfo.getLabel(context)); } else if (mSystemShortcutChild instanceof ImageView) { // Only the system shortcut icon shows on a gray background header. final ImageView shortcutIcon = (ImageView) mSystemShortcutChild; - shortcutIcon.setImageDrawable(mSystemShortcutInfo.getIcon(context, - android.R.attr.textColorHint)); + shortcutIcon.setImageDrawable(mSystemShortcutInfo.getIcon(context)); shortcutIcon.setContentDescription(mSystemShortcutInfo.getLabel(context)); } if (!(mSystemShortcutInfo instanceof SystemShortcut.Widgets)) { diff --git a/src/com/android/launcher3/popup/SystemShortcut.java b/src/com/android/launcher3/popup/SystemShortcut.java index de884996b..7d86163f0 100644 --- a/src/com/android/launcher3/popup/SystemShortcut.java +++ b/src/com/android/launcher3/popup/SystemShortcut.java @@ -30,10 +30,8 @@ public abstract class SystemShortcut { mLabelResId = labelResId; } - public Drawable getIcon(Context context, int colorAttr) { - Drawable icon = context.getResources().getDrawable(mIconResId); - icon.setTint(Themes.getAttrColor(context, colorAttr)); - return icon; + public Drawable getIcon(Context context) { + return context.getResources().getDrawable(mIconResId, context.getTheme()); } public String getLabel(Context context) { |