diff options
| author | 2018-04-18 14:01:01 +0000 | |
|---|---|---|
| committer | 2018-04-18 14:01:01 +0000 | |
| commit | 03ddb28cda9ee91245f24fdfb4839a6e68e3bced (patch) | |
| tree | 13a318dd512276c1ab5f0d8fa259be95001b1579 | |
| parent | b1b2e0e92c2abe830dfe77cd398179c1e4bbb6c5 (diff) | |
| parent | 6013e5cc961b64c7cbddb59dbef9fb249d364e9e (diff) | |
Merge "Color and text changes" into pi-dev
| -rw-r--r-- | core/java/android/app/Notification.java | 7 | ||||
| -rw-r--r-- | packages/SystemUI/res/layout/volume_dialog.xml | 2 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/strings.xml | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 8ee443b47b1a..22da924d1b8f 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -4574,13 +4574,14 @@ public class Notification implements Parcelable bindHeaderChronometerAndTime(contentView); bindProfileBadge(contentView); } - bindActivePermissions(contentView); + bindActivePermissions(contentView, ambient); bindExpandButton(contentView); mN.mUsesStandardHeader = true; } - private void bindActivePermissions(RemoteViews contentView) { - int color = isColorized() ? getPrimaryTextColor() : getSecondaryTextColor(); + private void bindActivePermissions(RemoteViews contentView, boolean ambient) { + int color = ambient ? resolveAmbientColor() + : isColorized() ? getPrimaryTextColor() : resolveContrastColor(); contentView.setDrawableTint(R.id.camera, false, color, PorterDuff.Mode.SRC_ATOP); contentView.setDrawableTint(R.id.mic, false, color, PorterDuff.Mode.SRC_ATOP); contentView.setDrawableTint(R.id.overlay, false, color, PorterDuff.Mode.SRC_ATOP); diff --git a/packages/SystemUI/res/layout/volume_dialog.xml b/packages/SystemUI/res/layout/volume_dialog.xml index dc4e255f650e..f6c2eebbab66 100644 --- a/packages/SystemUI/res/layout/volume_dialog.xml +++ b/packages/SystemUI/res/layout/volume_dialog.xml @@ -87,7 +87,7 @@ android:layout_gravity="center" android:contentDescription="@string/accessibility_volume_settings" android:background="@drawable/ripple_drawable_20dp" - android:tint="?android:attr/colorControlNormal" + android:tint="?android:attr/textColorHint" android:soundEffectsEnabled="false" /> </FrameLayout> </LinearLayout> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 090d012af72c..ae40db0f2d53 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -1586,7 +1586,7 @@ </plurals> <string name="notification_appops_settings">Settings</string> - <string name="notification_appops_ok">Ok</string> + <string name="notification_appops_ok">OK</string> <!-- Notification: Control panel: Accessibility description for expanded inline controls view, used to control settings about notifications related to the current notification. --> |