diff options
author | Tony Wickham <twickham@google.com> | 2017-02-27 16:30:47 -0800 |
---|---|---|
committer | Tony Wickham <twickham@google.com> | 2017-03-01 10:16:16 -0800 |
commit | 51889b0be83dc34c9752fc066d0d6e75ab4f5e26 (patch) | |
tree | b3c466ce4742e561fc19dce1a1a028a65f28801b /src/com/android/launcher3/notification/NotificationMainView.java | |
parent | 7f3526a1a4d5d3578d4648abb1422646d23c6080 (diff) | |
download | android_packages_apps_Trebuchet-51889b0be83dc34c9752fc066d0d6e75ab4f5e26.tar.gz android_packages_apps_Trebuchet-51889b0be83dc34c9752fc066d0d6e75ab4f5e26.tar.bz2 android_packages_apps_Trebuchet-51889b0be83dc34c9752fc066d0d6e75ab4f5e26.zip |
Merge deep shortcuts in rounded rect
- DeepShortcutViews are added to ShortcutsItemView, which
is in PopupContainerWithArrow
- Moved some shortcut-specific logic to ShortcutsItemView
(namely, touch/long-click handling for draggin shortcuts)
- Moved round-rect clipping to PopupItemView
- Removed collapseToIcon() logic, including
PillWidthRevealOutlineProvider, which was only used for
that purpose. It isn't necessary now that the deep
shortcuts have no background themselves.
- Replaced focus pill drawable with ripple effect on
shortcuts and notification view.
Bug: 35766387
Change-Id: I6bc09f1851cfbb806df4bf75a6e435b0f1900c9c
Diffstat (limited to 'src/com/android/launcher3/notification/NotificationMainView.java')
-rw-r--r-- | src/com/android/launcher3/notification/NotificationMainView.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/launcher3/notification/NotificationMainView.java b/src/com/android/launcher3/notification/NotificationMainView.java index b3425259b..824dbf279 100644 --- a/src/com/android/launcher3/notification/NotificationMainView.java +++ b/src/com/android/launcher3/notification/NotificationMainView.java @@ -22,7 +22,9 @@ import android.animation.ArgbEvaluator; import android.animation.ObjectAnimator; import android.animation.ValueAnimator; import android.content.Context; +import android.content.res.ColorStateList; import android.graphics.drawable.ColorDrawable; +import android.graphics.drawable.RippleDrawable; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; @@ -71,7 +73,9 @@ public class NotificationMainView extends LinearLayout implements SwipeHelper.Ca public void applyColors(IconPalette iconPalette) { mColorBackground = new ColorDrawable(iconPalette.backgroundColor); - setBackground(mColorBackground); + RippleDrawable rippleDrawable = new RippleDrawable(ColorStateList.valueOf( + iconPalette.secondaryColor), mColorBackground, null); + setBackground(rippleDrawable); mIconPalette = iconPalette; } |