Merge "Fix colors in bubble settings so they're more visible" into udc-dev
diff --git a/res/drawable/button_border_selected.xml b/res/drawable/button_border_selected.xml
index 1402380..113ae0c 100644
--- a/res/drawable/button_border_selected.xml
+++ b/res/drawable/button_border_selected.xml
@@ -15,9 +15,12 @@
limitations under the License.
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="rectangle">
+ <solid
+ android:color="?androidprv:attr/materialColorPrimaryContainer" />
<stroke
- android:width="2dp"
- android:color="?android:attr/colorAccent"/>
+ android:width="1dp"
+ android:color="?androidprv:attr/materialColorOnPrimaryContainer"/>
<corners android:radius="@dimen/rect_button_radius" />
</shape>
diff --git a/res/drawable/button_border_unselected.xml b/res/drawable/button_border_unselected.xml
index d0ce75b..c97a5ba 100644
--- a/res/drawable/button_border_unselected.xml
+++ b/res/drawable/button_border_unselected.xml
@@ -15,10 +15,10 @@
limitations under the License.
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="rectangle">
<stroke
android:width="1dp"
- android:color="?android:attr/colorAccent"/>
-
+ android:color="?androidprv:attr/materialColorOutlineVariant"/>
<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 9de7e0c..346cca3 100644
--- a/src/com/android/settings/notification/app/BubblePreference.java
+++ b/src/com/android/settings/notification/app/BubblePreference.java
@@ -167,9 +167,10 @@
: R.drawable.button_border_unselected));
mView.setSelected(selected);
- ColorStateList stateList = selected
- ? Utils.getColorAccent(context)
- : Utils.getColorAttr(context, android.R.attr.textColorPrimary);
+ int colorResId = selected
+ ? com.android.internal.R.attr.materialColorOnPrimaryContainer
+ : com.android.internal.R.attr.materialColorOnSurfaceVariant;
+ ColorStateList stateList = Utils.getColorAttr(context, colorResId);
mImageView.setImageTintList(stateList);
mTextView.setTextColor(stateList);
}