Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9db46712 authored by Mady Mellor's avatar Mady Mellor Committed by Automerger Merge Worker
Browse files

Merge "Update the colors for bubbles settings based on new spec" into udc-dev am: 57406435 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23622468



Change-Id: I045d775faec3df27cfde23e9b52ca29574d20511
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 86f36a03 57406435

res/drawable/button_border_selected.xml

+2 −2
Original line number Diff line number Diff line
@@ -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>

src/com/android/settings/notification/app/BubblePreference.java

+1 −1
Original line number Diff line number Diff line
@@ -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);