diff options
| author | Selim Cinek <cinek@google.com> | 2020-03-24 19:16:02 -0700 |
|---|---|---|
| committer | Selim Cinek <cinek@google.com> | 2020-03-30 16:18:09 -0700 |
| commit | 79d9863ebc504ebbd93cb7c6d1e9514c2e1a408a (patch) | |
| tree | 17229f76260d43ce6b26cfe598fe783e5eb624fa /core/java/android | |
| parent | b98be8b6a9fea74dea1c41ccbabac791479583d6 (diff) | |
Adapted Shelf algorithm to also use conversation icons
Previously the algorithm would only work with a header
and the icon wouldn't transform into the shelf.
This is now fixed.
Bug: 150905003
Test: add conversation notification, observe normal transition
Change-Id: I533b8f06bee29ee93888d748808b4313fef338e8
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/Notification.java | 2 | ||||
| -rw-r--r-- | core/java/android/view/NotificationHeaderView.java | 8 |
2 files changed, 2 insertions, 8 deletions
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 31fc2d080c3d..d3324f9e106e 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -5817,7 +5817,7 @@ public class Notification implements Parcelable PorterDuff.Mode.SRC_ATOP); } - contentView.setInt(R.id.notification_header, "setOriginalIconColor", + contentView.setInt(R.id.icon, "setOriginalIconColor", colorable ? color : NotificationHeaderView.NO_COLOR); } diff --git a/core/java/android/view/NotificationHeaderView.java b/core/java/android/view/NotificationHeaderView.java index 18e0132e2c4e..0359f3b4fde7 100644 --- a/core/java/android/view/NotificationHeaderView.java +++ b/core/java/android/view/NotificationHeaderView.java @@ -65,7 +65,6 @@ public class NotificationHeaderView extends ViewGroup { private View mMicIcon; private View mAppOps; private View mAudiblyAlertedIcon; - private int mIconColor; private boolean mExpanded; private boolean mShowExpandButtonAtEnd; private boolean mShowWorkBadgeAtEnd; @@ -315,13 +314,8 @@ public class NotificationHeaderView extends ViewGroup { updateTouchListener(); } - @RemotableViewMethod - public void setOriginalIconColor(int color) { - mIconColor = color; - } - public int getOriginalIconColor() { - return mIconColor; + return mIcon.getOriginalIconColor(); } public int getOriginalNotificationColor() { |