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

Commit a7c0f2a8 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 10286161 from 8a478993 to udc-release 

Change-Id: I38106763d5c0ef7ae6547d15119df177b2c1c270
parents 34c68ad5 8a478993

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>

res/values/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ 


    <style name="WorkChallengeEmergencyButtonStyle">

        <item name="android:background">@drawable/work_challenge_emergency_button_background</item>

        <item name="android:textColor">?android:attr/textColorPrimary</item>

        <item name="android:textColor">@android:color/system_accent3_900</item>

        <item name="android:outlineProvider">none</item>

        <item name="android:paddingTop">15dp</item>

        <item name="android:paddingBottom">15dp</item>

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

        }