diff options
| author | Android Dialer <noreply@google.com> | 2018-06-27 13:22:38 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-06-27 13:22:38 -0700 |
| commit | a582e75614b8bcfc6849f83641575a4540afab45 (patch) | |
| tree | 3a32e17e1d9c79e8306119d817fd7964fbef82d1 /java/com/android/dialer/theme/common/res/values/text_styles.xml | |
| parent | fb5fa0a8f1a138c8957ccfd848e22168349e9574 (diff) | |
| parent | 95194792e7f479979bef3290165952480a97af58 (diff) | |
Merge changes I0f1ed20a,Ia68d3b13,I72047d59,Ieff3c7fb,I53c3896a, ... am: 1b4ec7b954 am: cd5228be7f
am: 95194792e7
Change-Id: I98da32480b2c1fba7f6c133515e79da794753fe5
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 | 11 |
1 files changed, 11 insertions, 0 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 0d1fd850e..df5dafa31 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 @@ -43,6 +43,12 @@ <item name="android:fontFamily">sans-serif-regular</item> </style> + <style name="Dialer.TextAppearance.Primary2" parent="TextAppearance.AppCompat"> + <item name="android:textColor">?android:attr/textColorPrimary</item> + <item name="android:textSize">16sp</item> + <item name="android:fontFamily">sans-serif-regular</item> + </style> + <style name="Dialer.TextAppearance.Secondary" parent="TextAppearance.AppCompat"> <item name="android:textColor">?android:attr/textColorSecondary</item> <item name="android:textSize">14sp</item> @@ -81,6 +87,11 @@ <item name="android:maxLines">1</item> </style> + <style name="Dialer.TextAppearance.Primary2.Ellipsize"> + <item name="android:ellipsize">end</item> + <item name="android:maxLines">1</item> + </style> + <style name="Dialer.TextAppearance.Secondary.Ellipsize"> <item name="android:ellipsize">end</item> <item name="android:maxLines">1</item> |