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

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

Merge "Fix colors in bubble settings so they're more visible" into udc-dev am:... 

Merge "Fix colors in bubble settings so they're more visible" into udc-dev am: 8a478993 am: 7605e122

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



Change-Id: I616264cebad588f95f8c1756e81bca62927ddbb9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8f3679ab 7605e122

res/drawable/button_border_selected.xml

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

res/drawable/button_border_unselected.xml

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

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

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

        }