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

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

Browse Source
This commit is contained in:
Massimo Carli
2023-02-22 14:22:22 +00:00
committed by Android (Google) Code Review
parent 1c64df3e5f b755dacc3c
commit 98626dc72d
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_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:lineSpacingExtra="4sp" android:lineSpacingExtra="4sp"
android:letterSpacing="0.02"
android:background="@drawable/compat_hint_bubble" android:background="@drawable/compat_hint_bubble"
android:padding="16dp" android:padding="16dp"
android:textAlignment="viewStart" android:textAlignment="viewStart"
android:textColor="@color/compat_controls_text" 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 <ImageView
android:layout_width="wrap_content" 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"/> android:layout_marginBottom="20dp"/>
<TextView <TextView
android:fontFamily="@*android:string/config_bodyFontFamily"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body2"
android:id="@+id/letterbox_education_dialog_action_text" android:id="@+id/letterbox_education_dialog_action_text"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" 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:text="@string/letterbox_education_dialog_title"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/compat_controls_text" android:textColor="@color/compat_controls_text"
android:fontFamily="@*android:string/config_bodyFontFamilyMedium"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Headline"
android:textSize="24sp"/> android:textSize="24sp"/>
<LinearLayout <LinearLayout
@@ -95,10 +97,16 @@
</LinearLayout> </LinearLayout>
<Button <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:id="@+id/letterbox_education_dialog_dismiss_button"
android:textStyle="bold"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="56dp" android:layout_height="56dp"
android:layout_marginTop="40dp" android:layout_marginTop="40dp"
android:textSize="14sp"
android:background= android:background=
"@drawable/letterbox_education_dismiss_button_background_ripple" "@drawable/letterbox_education_dismiss_button_background_ripple"
android:text="@string/letterbox_education_got_it" 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"> <item name="android:textAppearance">
@*android:style/TextAppearance.DeviceDefault.Headline @*android:style/TextAppearance.DeviceDefault.Headline
</item> </item>
<item name="android:fontFamily">
@*android:string/config_bodyFontFamilyMedium
</item>
</style> </style>
<style name="RestartDialogBodyText"> <style name="RestartDialogBodyText">
@@ -97,24 +100,44 @@
<item name="android:textAppearance"> <item name="android:textAppearance">
@*android:style/TextAppearance.DeviceDefault.Body2 @*android:style/TextAppearance.DeviceDefault.Body2
</item> </item>
<item name="android:fontFamily">
@*android:string/config_bodyFontFamily
</item>
</style> </style>
<style name="RestartDialogCheckboxText"> <style name="RestartDialogCheckboxText">
<item name="android:textSize">16sp</item> <item name="android:textSize">16sp</item>
<item name="android:textColor">?android:attr/textColorPrimary</item> <item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:lineSpacingExtra">4sp</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>
<style name="RestartDialogDismissButton"> <style name="RestartDialogDismissButton">
<item name="android:lineSpacingExtra">2sp</item> <item name="android:lineSpacingExtra">2sp</item>
<item name="android:textSize">14sp</item> <item name="android:textSize">14sp</item>
<item name="android:textColor">?android:attr/textColorPrimary</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>
<style name="RestartDialogConfirmButton"> <style name="RestartDialogConfirmButton">
<item name="android:lineSpacingExtra">2sp</item> <item name="android:lineSpacingExtra">2sp</item>
<item name="android:textSize">14sp</item> <item name="android:textSize">14sp</item>
<item name="android:textColor">?android:attr/textColorPrimaryInverse</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> </style>
</resources> </resources>