diff options
| author | Tony <twickham@google.com> | 2017-05-10 01:19:41 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-10 01:19:41 +0000 |
| commit | e37d2b9f322d5a654f6089b90141a087ec484d72 (patch) | |
| tree | 5ee402fcfee791ca79811f47dde3b1ab6d5a1b30 /src/com/android/launcher3/shortcuts | |
| parent | 7588a8c391cd44722e397c0fa1dc9ae5a1017fbe (diff) | |
| parent | 5cfde85cb6d095585b932d9e3e2c4fe78aa0dafe (diff) | |
| download | android_packages_apps_Trebuchet-e37d2b9f322d5a654f6089b90141a087ec484d72.tar.gz android_packages_apps_Trebuchet-e37d2b9f322d5a654f6089b90141a087ec484d72.tar.bz2 android_packages_apps_Trebuchet-e37d2b9f322d5a654f6089b90141a087ec484d72.zip | |
Merge "Visual updates for popup" into ub-launcher3-dorval
am: 5cfde85cb6
Change-Id: I4e97cb52054b5c5ff467f3481b92730f6f9a3e8e
Diffstat (limited to 'src/com/android/launcher3/shortcuts')
| -rw-r--r-- | src/com/android/launcher3/shortcuts/ShortcutsItemView.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/com/android/launcher3/shortcuts/ShortcutsItemView.java b/src/com/android/launcher3/shortcuts/ShortcutsItemView.java index a5c3120a5..5b3b02eac 100644 --- a/src/com/android/launcher3/shortcuts/ShortcutsItemView.java +++ b/src/com/android/launcher3/shortcuts/ShortcutsItemView.java @@ -20,6 +20,7 @@ import android.animation.Animator; import android.animation.AnimatorSet; import android.content.Context; import android.graphics.Point; +import android.support.v4.content.ContextCompat; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; @@ -246,6 +247,14 @@ public class ShortcutsItemView extends PopupItemView implements View.OnLongClick } @Override + public int getArrowColor(boolean isArrowAttachedToBottom) { + return ContextCompat.getColor(getContext(), + isArrowAttachedToBottom || mSystemShortcutIcons == null + ? R.color.popup_background_color + : R.color.popup_header_background_color); + } + + @Override public void fillInLogContainerData(View v, ItemInfo info, LauncherLogProto.Target target, LauncherLogProto.Target targetParent) { target.itemType = LauncherLogProto.ItemType.DEEPSHORTCUT; |