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

Commit 4d225a0e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update bubble user education screens to use proper colors" into sc-dev

parents 94ba8dd4 bba5ed77

libs/WindowManager/Shell/res/drawable/bubble_stack_user_education_bg.xml

+3 −2
Original line number Diff line number Diff line
@@ -14,9 +14,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">

    <solid android:color="?android:attr/colorAccent"/>

    <corners

        android:bottomRightRadius="360dp"

        android:topRightRadius="360dp" />

    <solid android:color="?androidprv:attr/colorAccentPrimary" />

</shape>
 
 No newline at end of file

libs/WindowManager/Shell/res/drawable/bubble_stack_user_education_bg_rtl.xml

+2 −1
Original line number Diff line number Diff line
@@ -14,9 +14,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">

    <solid android:color="?android:attr/colorAccent"/>

    <corners

        android:bottomLeftRadius="360dp"

        android:topLeftRadius="360dp" />

    <solid android:color="?androidprv:attr/colorAccentPrimary" />

</shape>

libs/WindowManager/Shell/res/layout/bubble_stack_user_education.xml

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
        android:gravity="start"

        android:textAlignment="viewStart"

        android:text="@string/bubbles_user_education_title"

        android:textColor="?android:attr/textColorPrimaryInverse"

        android:textColor="@android:color/system_neutral1_900"

        android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Headline"/>



    <TextView
@@ -49,7 +49,7 @@ 
        android:gravity="start"

        android:textAlignment="viewStart"

        android:text="@string/bubbles_user_education_description"

        android:textColor="?android:attr/textColorPrimaryInverse"

        android:textColor="@android:color/system_neutral1_900"

        android:fontFamily="@*android:string/config_bodyFontFamily"

        android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body2"/>

</LinearLayout>

libs/WindowManager/Shell/res/layout/bubbles_manage_button_education.xml

+4 −4
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
        android:ellipsize="end"

        android:gravity="start"

        android:textAlignment="viewStart"

        android:textColor="?android:attr/textColorPrimaryInverse"

        android:textColor="@android:color/system_neutral1_900"

        android:text="@string/bubbles_user_education_manage_title"

        android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Headline"/>
@@ -56,7 +56,7 @@ 
        android:ellipsize="end"

        android:gravity="start"

        android:textAlignment="viewStart"

        android:textColor="?android:attr/textColorPrimaryInverse"

        android:textColor="@android:color/system_neutral1_900"

        android:fontFamily="@*android:string/config_bodyFontFamily"

        android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body2"/>
@@ -75,7 +75,7 @@ 
            android:focusable="true"

            android:clickable="false"

            android:text="@string/manage_bubbles_text"

            android:textColor="?android:attr/textColorPrimaryInverse"

            android:textColor="@android:color/system_neutral1_900"

            />



        <com.android.wm.shell.common.AlphaOptimizedButton
@@ -86,7 +86,7 @@ 
            android:layout_height="wrap_content"

            android:focusable="true"

            android:text="@string/bubbles_user_education_got_it"

            android:textColor="?android:attr/textColorPrimaryInverse"

            android:textColor="@android:color/system_neutral1_900"

            />

    </LinearLayout>

</LinearLayout>