diff options
| author | 2018-12-03 16:28:10 +0000 | |
|---|---|---|
| committer | 2018-12-03 16:28:10 +0000 | |
| commit | bdec1470683c25cf3d285f2808d84cdda3933017 (patch) | |
| tree | ed21aa5da32cdef411451da350eb47eaac191cc1 | |
| parent | 5494113f675de47c810ab4f8543918e5f508571a (diff) | |
| parent | bae5ba39dd73b5d5c8ace0ce737d398c28dc44ff (diff) | |
Merge "Updates color and size of bell icon."
| -rw-r--r-- | core/java/android/app/Notification.java | 9 | ||||
| -rw-r--r-- | core/res/res/layout/notification_template_header.xml | 1 | ||||
| -rw-r--r-- | core/res/res/values/dimens.xml | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 3f37b0ff8929..0281e6a0631e 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -4471,6 +4471,14 @@ public class Notification implements Parcelable } } + private void bindAlertedIcon(RemoteViews contentView, StandardTemplateParams p) { + contentView.setDrawableTint( + R.id.alerted_icon, + false /* targetBackground */, + getNeutralColor(p), + PorterDuff.Mode.SRC_ATOP); + } + /** * @hide */ @@ -4873,6 +4881,7 @@ public class Notification implements Parcelable bindHeaderTextSecondary(contentView, p); bindHeaderChronometerAndTime(contentView, p); bindProfileBadge(contentView, p); + bindAlertedIcon(contentView, p); } bindActivePermissions(contentView, p); bindExpandButton(contentView, p); diff --git a/core/res/res/layout/notification_template_header.xml b/core/res/res/layout/notification_template_header.xml index 433ae399c88c..4bf1ad6651ee 100644 --- a/core/res/res/layout/notification_template_header.xml +++ b/core/res/res/layout/notification_template_header.xml @@ -126,7 +126,6 @@ android:visibility="gone" android:contentDescription="@string/notification_alerted_content_description" android:src="@drawable/ic_notifications_alerted" - android:tint="@color/notification_secondary_text_color_light" /> <ImageView android:id="@+id/profile_badge" diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml index f7b9961c39e8..05a156b69371 100644 --- a/core/res/res/values/dimens.xml +++ b/core/res/res/values/dimens.xml @@ -430,7 +430,7 @@ <dimen name="notification_badge_size">12dp</dimen> <!-- Size of the alerted icon for notifications --> - <dimen name="notification_alerted_size">18dp</dimen> + <dimen name="notification_alerted_size">12dp</dimen> <!-- Keyguard dimensions --> <!-- TEMP --> |