Merge "Updates color and size of bell icon." (bdec1470) · Commits · e / os / android_frameworks_base

core/java/android/app/Notification.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -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);

+0 −1

Original line number	Diff line number	Diff line
		@@ -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"

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 -->