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

Commit 57406435 authored by Mady Mellor's avatar Mady Mellor Committed by Android (Google) Code Review
Browse files

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

parents 01b38254 fb1e921b

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);