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

Commit f1846788 authored by Mady Mellor's avatar Mady Mellor
Browse files

Fix colors in bubble settings so they're more visible 

Test: manual - get a bubble, go to that apps bubble settings screen,
               observe the colors look correct, switch theme and
               check again.
Bug: 283951560
Change-Id: I361b1c20e293c02b4d604e0b5845a074c31e5103
parent b5dda005

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

        }