diff options
| author | calderwoodra <calderwoodra@google.com> | 2018-05-23 12:59:03 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-piper@google.com> | 2018-05-29 23:26:22 -0700 |
| commit | a93df43762f1539593da5f90bec16be2be01d281 (patch) | |
| tree | 88c45d7ab1bd0242f6a0873158da6e5152e82ecd /java/com/android/dialer/theme/common/res/values/text_styles.xml | |
| parent | ffd525d8eb9dbe1bc4d87909b01371743c296a16 (diff) | |
Converted ThemeUtil into a DaggerModule.
This enables us to have Google-Sans font in GoogleDialer and Roboto in AOSP.
Bug: 79883035
Test: tap
PiperOrigin-RevId: 197774497
Change-Id: I1d490ab196a444c62e439444627d659fc42973ea
Diffstat (limited to 'java/com/android/dialer/theme/common/res/values/text_styles.xml')
| -rw-r--r-- | java/com/android/dialer/theme/common/res/values/text_styles.xml | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/java/com/android/dialer/theme/common/res/values/text_styles.xml b/java/com/android/dialer/theme/common/res/values/text_styles.xml index 9cf4a7689..def5862d4 100644 --- a/java/com/android/dialer/theme/common/res/values/text_styles.xml +++ b/java/com/android/dialer/theme/common/res/values/text_styles.xml @@ -31,6 +31,12 @@ <item name="android:fontFamily">sans-serif-medium</item> </style> + <style name="Dialer.TextAppearance.SubHeader" parent="TextAppearance.AppCompat"> + <item name="android:textColor">?android:attr/textColorPrimary</item> + <item name="android:textSize">16sp</item> + <item name="android:fontFamily">sans-serif-medium</item> + </style> + <style name="Dialer.TextAppearance.Primary" parent="TextAppearance.AppCompat"> <item name="android:textColor">?android:attr/textColorPrimary</item> <item name="android:textSize">16sp</item> @@ -55,32 +61,37 @@ <item name="android:fontFamily">sans-serif-medium</item> </style> - <style name="Dialer.TextAppearance.Header1.Ellipsize" parent="Dialer.TextAppearance.Header1"> + <style name="Dialer.TextAppearance.Header1.Ellipsize"> + <item name="android:ellipsize">end</item> + <item name="android:maxLines">1</item> + </style> + + <style name="Dialer.TextAppearance.Header2.Ellipsize"> <item name="android:ellipsize">end</item> <item name="android:maxLines">1</item> </style> - <style name="Dialer.TextAppearance.Header2.Ellipsize" parent="Dialer.TextAppearance.Header2"> + <style name="Dialer.TextAppearance.SubHeader.Ellipsize"> <item name="android:ellipsize">end</item> <item name="android:maxLines">1</item> </style> - <style name="Dialer.TextAppearance.Primary.Ellipsize" parent="Dialer.TextAppearance.Primary"> + <style name="Dialer.TextAppearance.Primary.Ellipsize"> <item name="android:ellipsize">end</item> <item name="android:maxLines">1</item> </style> - <style name="Dialer.TextAppearance.Secondary.Ellipsize" parent="Dialer.TextAppearance.Secondary"> + <style name="Dialer.TextAppearance.Secondary.Ellipsize"> <item name="android:ellipsize">end</item> <item name="android:maxLines">1</item> </style> - <style name="Dialer.TextAppearance.Secondary2.Ellipsize" parent="Dialer.TextAppearance.Secondary"> + <style name="Dialer.TextAppearance.Secondary2.Ellipsize"> <item name="android:ellipsize">end</item> <item name="android:maxLines">1</item> </style> - <style name="Dialer.TextAppearance.OVERLINE.Ellipsize" parent="Dialer.TextAppearance.OVERLINE"> + <style name="Dialer.TextAppearance.OVERLINE.Ellipsize"> <item name="android:ellipsize">end</item> <item name="android:maxLines">1</item> </style> |