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>
This commit is contained in:
Mady Mellor
2023-06-09 16:17:46 +00:00
committed by Automerger Merge Worker
2 changed files with 3 additions and 3 deletions

View File

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

View File

@@ -168,7 +168,7 @@ public class BubblePreference extends Preference implements View.OnClickListener
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);