Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Align Compat UI to System UI fonts and textAppearance

Browse Source 
Fixes: 269077823
Test: Launch a size compat mode restart dialog and check the fonts.
      Same for the letterbox education dialog and the restart button
      tooltip.

Change-Id: I1044e4078b09260876d21e5259b6bf26e5b3be75
This commit is contained in:
Massimo Carli
2023-02-14 17:48:51 +00:00
parent a100480ad7
commit b755dacc3c
4 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/WindowManager/Shell/res/layout/compat_mode_hint.xml
View File

@@ -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"

2
libs/WindowManager/Shell/res/layout/letterbox_education_dialog_action_layout.xml
View File

@@ -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"

8
libs/WindowManager/Shell/res/layout/letterbox_education_dialog_layout.xml
View File

@@ -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"

25
libs/WindowManager/Shell/res/values/styles.xml
View File

@@ -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>