diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-06-27 19:53:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-06-27 19:53:55 +0000 |
| commit | 1b4ec7b954ba2d8efae2f383697babe54b795f67 (patch) | |
| tree | 4c051c4a8702f4256f83f0e55182e27b2ed5b840 /java/com/android/dialer/theme/common/res/values/text_styles.xml | |
| parent | cae28c6d5c04a79fb058043ce0c3e043e610309a (diff) | |
| parent | d637af51091dc86a197da6520484e10a356a421b (diff) | |
Merge changes I0f1ed20a,Ia68d3b13,I72047d59,Ieff3c7fb,I53c3896a, ...
* changes:
Added method to set Save and Redo buttons enabled/disabled Added logic to setState() method to change state of buttons
Update emergency call map and device number UI.
Fix SpeedDialUiItem.getDefaultVoiceChannel
Fix an AOSP build error caused by version codes
Update connection label.
Remove redundant version checks and annotations in the assisted dialing package.
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> |