Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Color and text changes

Browse Source 
Change-Id: I2b1837ffd16911be20b5d5f9a7007ff3071265ab
Fixes: 78191129
Fixes: 77810424
Fixes: 78196346
Test: manual inspection
This commit is contained in:
Julia Reynolds
2018-04-18 08:43:34 -04:00
parent f921b507ea
commit 6013e5cc96
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/app/Notification.java
View File

@@ -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);

2
packages/SystemUI/res/layout/volume_dialog.xml
View File

@@ -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>

2
packages/SystemUI/res/values/strings.xml
View File

@@ -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. -->