Merge "Update the colors for bubbles settings based on new spec" into udc-dev am: 57406435cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23622468
Change-Id: I9ba9a9b9a7fb9ba79d5b3f28a4627f28937eb7ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/res/drawable/button_border_selected.xml b/res/drawable/button_border_selected.xml
index 113ae0c..3757517 100644
--- a/res/drawable/button_border_selected.xml
+++ b/res/drawable/button_border_selected.xml
@@ -18,9 +18,9 @@
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="rectangle">
<solid
- android:color="?androidprv:attr/materialColorPrimaryContainer" />
+ android:color="?androidprv:attr/materialColorSecondaryContainer" />
<stroke
android:width="1dp"
- android:color="?androidprv:attr/materialColorOnPrimaryContainer"/>
+ android:color="?androidprv:attr/materialColorOnSecondaryContainer"/>
<corners android:radius="@dimen/rect_button_radius" />
</shape>
diff --git a/src/com/android/settings/notification/app/BubblePreference.java b/src/com/android/settings/notification/app/BubblePreference.java
index 346cca3..44b8d17 100644
--- a/src/com/android/settings/notification/app/BubblePreference.java
+++ b/src/com/android/settings/notification/app/BubblePreference.java
@@ -168,7 +168,7 @@
mView.setSelected(selected);
int colorResId = selected
- ? com.android.internal.R.attr.materialColorOnPrimaryContainer
+ ? com.android.internal.R.attr.materialColorOnSecondaryContainer
: com.android.internal.R.attr.materialColorOnSurfaceVariant;
ColorStateList stateList = Utils.getColorAttr(context, colorResId);
mImageView.setImageTintList(stateList);