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

Commit 89824784 authored by Massimo Carli's avatar Massimo Carli Committed by Automerger Merge Worker
Browse files

Merge "Align Compat UI to System UI fonts and textAppearance" into tm-qpr-dev... 

Merge "Align Compat UI to System UI fonts and textAppearance" into tm-qpr-dev am: 98626dc7 am: f2c72fe0 am: ecb58f94

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



Change-Id: I3160d0d5d9b2d70d510de528cfbe03897e6e2467
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c1fd8713 ecb58f94

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

+5 −1
Original line number Diff line number Diff line
@@ -29,11 +29,15 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:lineSpacingExtra="4sp"

        android:letterSpacing="0.02"

        android:background="@drawable/compat_hint_bubble"

        android:padding="16dp"

        android:textAlignment="viewStart"

        android:textColor="@color/compat_controls_text"

        android:textSize="14sp"/>

        android:textSize="14sp"

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

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

    />



    <ImageView

        android:layout_width="wrap_content"

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

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ 
        android:layout_marginBottom="20dp"/>



    <TextView

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

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

        android:id="@+id/letterbox_education_dialog_action_text"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

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

+8 −0
Original line number Diff line number Diff line
@@ -69,6 +69,8 @@ 
                    android:text="@string/letterbox_education_dialog_title"

                    android:textAlignment="center"

                    android:textColor="@color/compat_controls_text"

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

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

                    android:textSize="24sp"/>



                <LinearLayout
@@ -95,10 +97,16 @@ 
                </LinearLayout>



                <Button

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

                    android:fontWeight="500"

                    android:lineHeight="20dp"

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

                    android:id="@+id/letterbox_education_dialog_dismiss_button"

                    android:textStyle="bold"

                    android:layout_width="match_parent"

                    android:layout_height="56dp"

                    android:layout_marginTop="40dp"

                    android:textSize="14sp"

                    android:background=

                        "@drawable/letterbox_education_dismiss_button_background_ripple"

                    android:text="@string/letterbox_education_got_it"

libs/WindowManager/Shell/res/values/styles.xml

+24 −1
Original line number Diff line number Diff line
@@ -87,6 +87,9 @@ 
        <item name="android:textAppearance">

            @*android:style/TextAppearance.DeviceDefault.Headline

        </item>

        <item name="android:fontFamily">

            @*android:string/config_bodyFontFamilyMedium

        </item>

    </style>



    <style name="RestartDialogBodyText">
@@ -97,24 +100,44 @@ 
        <item name="android:textAppearance">

            @*android:style/TextAppearance.DeviceDefault.Body2

        </item>

        <item name="android:fontFamily">

            @*android:string/config_bodyFontFamily

        </item>

    </style>



    <style name="RestartDialogCheckboxText">

        <item name="android:textSize">16sp</item>

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

        <item name="android:lineSpacingExtra">4sp</item>

        <item name="android:textAppearance">@*android:style/TextAppearance.DeviceDefault</item>

        <item name="android:textAppearance">

            @*android:style/TextAppearance.DeviceDefault.Headline

        </item>

        <item name="android:fontFamily">

            @*android:string/config_bodyFontFamilyMedium

        </item>

    </style>



    <style name="RestartDialogDismissButton">

        <item name="android:lineSpacingExtra">2sp</item>

        <item name="android:textSize">14sp</item>

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

        <item name="android:textAppearance">

            @*android:style/TextAppearance.DeviceDefault.Body2

        </item>

        <item name="android:fontFamily">

            @*android:string/config_bodyFontFamily

        </item>

    </style>



    <style name="RestartDialogConfirmButton">

        <item name="android:lineSpacingExtra">2sp</item>

        <item name="android:textSize">14sp</item>

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

        <item name="android:textAppearance">

            @*android:style/TextAppearance.DeviceDefault.Body2

        </item>

        <item name="android:fontFamily">

            @*android:string/config_bodyFontFamily

        </item>

    </style>

</resources>