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

Merge "Color and text changes" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-04-18 14:01:01 +00:00
committed by Android (Google) Code Review
parent b1b2e0e92c 6013e5cc96
commit 03ddb28cda
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); bindHeaderChronometerAndTime(contentView);
bindProfileBadge(contentView); bindProfileBadge(contentView);
} }
bindActivePermissions(contentView); bindActivePermissions(contentView, ambient);
bindExpandButton(contentView); bindExpandButton(contentView);
mN.mUsesStandardHeader = true; mN.mUsesStandardHeader = true;
} }
private void bindActivePermissions(RemoteViews contentView) { private void bindActivePermissions(RemoteViews contentView, boolean ambient) {
int color = isColorized() ? getPrimaryTextColor() : getSecondaryTextColor(); int color = ambient ? resolveAmbientColor()
: isColorized() ? getPrimaryTextColor() : resolveContrastColor();
contentView.setDrawableTint(R.id.camera, false, color, PorterDuff.Mode.SRC_ATOP); 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.mic, false, color, PorterDuff.Mode.SRC_ATOP);
contentView.setDrawableTint(R.id.overlay, 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:layout_gravity="center"
android:contentDescription="@string/accessibility_volume_settings" android:contentDescription="@string/accessibility_volume_settings"
android:background="@drawable/ripple_drawable_20dp" android:background="@drawable/ripple_drawable_20dp"
android:tint="?android:attr/colorControlNormal" android:tint="?android:attr/textColorHint"
android:soundEffectsEnabled="false" /> android:soundEffectsEnabled="false" />
</FrameLayout> </FrameLayout>
</LinearLayout> </LinearLayout>

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

@@ -1586,7 +1586,7 @@
</plurals> </plurals>
<string name="notification_appops_settings">Settings</string> <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 <!-- Notification: Control panel: Accessibility description for expanded inline controls view, used
to control settings about notifications related to the current notification. --> to control settings about notifications related to the current notification. -->