Merge "Fix colors in bubble settings so they're more visible" into udc-dev am: 8a47899369 am: 7605e122ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23607273 Change-Id: I616264cebad588f95f8c1756e81bca62927ddbb9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -167,9 +167,10 @@ public class BubblePreference extends Preference implements View.OnClickListener
|
||||
: 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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user