PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Material Next] Typography for font style" into sc-dev

Browse Source
This commit is contained in:
Menghan Li
2021-05-04 06:22:58 +00:00
committed by Android (Google) Code Review
parent 37d6d0835c 39229a6aea
commit 4ec4cf32f1
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/palette_listview_item.xml
View File

@@ -23,7 +23,7 @@
android:id="@+id/item_textview" android:id="@+id/item_textview"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="42dp" android:layout_height="42dp"
android:fontFamily="roboto-bold" android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
android:gravity="center_vertical" android:gravity="center_vertical"
android:maxLength="20" android:maxLength="20"
android:paddingLeft="@dimen/accessibility_layout_margin_start_end" android:paddingLeft="@dimen/accessibility_layout_margin_start_end"

6
res/values/styles.xml
View File

@@ -665,7 +665,7 @@
<item name="android:gravity">center</item> <item name="android:gravity">center</item>
<item name="android:textSize">20sp</item> <item name="android:textSize">20sp</item>
<item name="android:textColor">?android:attr/textColorPrimary</item> <item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:fontFamily">google-sans-medium</item> <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
</style> </style>
<style name="AccessibilityDialogDescription" <style name="AccessibilityDialogDescription"
@@ -676,7 +676,6 @@
<item name="android:layout_marginBottom">32dp</item> <item name="android:layout_marginBottom">32dp</item>
<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:fontFamily">sans-serif</item>
</style> </style>
<style name="AccessibilityDialogPermissionTitle" <style name="AccessibilityDialogPermissionTitle"
@@ -685,7 +684,7 @@
<item name="android:layout_height">wrap_content</item> <item name="android:layout_height">wrap_content</item>
<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:fontFamily">sans-serif</item> <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
</style> </style>
<style name="AccessibilityDialogPermissionDescription" <style name="AccessibilityDialogPermissionDescription"
@@ -694,7 +693,6 @@
<item name="android:layout_height">wrap_content</item> <item name="android:layout_height">wrap_content</item>
<item name="android:textSize">14sp</item> <item name="android:textSize">14sp</item>
<item name="android:textColor">?android:attr/textColorSecondary</item> <item name="android:textColor">?android:attr/textColorSecondary</item>
<item name="android:fontFamily">sans-serif</item>
</style> </style>
<style name="AccessibilityDialogButtonBarSpace"> <style name="AccessibilityDialogButtonBarSpace">