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

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

Merge "Fix text color for bubble user education screens" into sc-dev am: 8e29f94a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14356512

Change-Id: Ic912b13fa4aa26de4f0dccc624147967fda4656c
parents 355eea4a 8e29f94a

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

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

        android:textAlignment="viewStart"

        android:text="@string/bubbles_user_education_title"

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

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



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

        android:textAlignment="viewStart"

        android:text="@string/bubbles_user_education_description"

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

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

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

</LinearLayout>

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

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

        android:gravity="start"

        android:textAlignment="viewStart"

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

        android:text="@string/bubbles_user_education_manage_title"

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

        android:gravity="start"

        android:textAlignment="viewStart"

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

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

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