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

Merge "Update letterbox restart dialog style to match other Android U dialogs" into udc-dev am: 565b8127e1

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

Change-Id: Iedfe08c6fc162630f6bcc75c2e50b52c9db16b0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Eghosa Ewansiha-Vlachavas
2023-06-09 12:06:15 +00:00
committed by Automerger Merge Worker
parent 41f45549a5 565b8127e1
commit 287b71d808
1 changed files with 12 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -93,62 +93,34 @@
<style name="RestartDialogTitleText"> <style name="RestartDialogTitleText">
<item name="android:textSize">24sp</item> <item name="android:textSize">24sp</item>
<item name="android:textColor">?android:attr/textColorPrimary</item> <item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:lineSpacingExtra">2sp</item> <item name="android:lineSpacingExtra">8sp</item>
<item name="android:textAppearance"> <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
@*android:style/TextAppearance.DeviceDefault.Headline
</item>
<item name="android:fontFamily">
@*android:string/config_bodyFontFamilyMedium
</item>
</style> </style>
<style name="RestartDialogBodyText"> <style name="RestartDialogBodyStyle">
<item name="android:textSize">14sp</item> <item name="android:textSize">14sp</item>
<item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
</style>
<style name="RestartDialogBodyText" parent="RestartDialogBodyStyle">
<item name="android:letterSpacing">0.02</item> <item name="android:letterSpacing">0.02</item>
<item name="android:textColor">?android:attr/textColorSecondary</item> <item name="android:textColor">?android:attr/textColorSecondary</item>
<item name="android:lineSpacingExtra">2sp</item> <item name="android:lineSpacingExtra">6sp</item>
<item name="android:textAppearance">
@*android:style/TextAppearance.DeviceDefault.Body2
</item>
<item name="android:fontFamily">
@*android:string/config_bodyFontFamily
</item>
</style> </style>
<style name="RestartDialogCheckboxText"> <style name="RestartDialogCheckboxText" parent="RestartDialogBodyStyle">
<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">6sp</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" parent="RestartDialogBodyStyle">
<item name="android:lineSpacingExtra">2sp</item> <item name="android:lineSpacingExtra">2sp</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" parent="RestartDialogBodyStyle">
<item name="android:lineSpacingExtra">2sp</item> <item name="android:lineSpacingExtra">2sp</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>
<style name="ReachabilityEduHandLayout" parent="Theme.AppCompat.Light"> <style name="ReachabilityEduHandLayout" parent="Theme.AppCompat.Light">