diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-06-29 01:14:29 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-06-29 01:14:29 +0000 |
commit | e479c7d417573ac142b336c904ce0643e010f7dd (patch) | |
tree | da969d7848ed5e86dc55858778fa912219c4be74 /java/com/android/dialer/theme/common | |
parent | 2e3e5ff3f2dfd4106b22835c1bf68bf551dcc032 (diff) | |
parent | 70c045940de7ca1270cad559229ae3d5e9273301 (diff) |
Merge changes I40cf6e7d,Iff515ae2,If8ca1f57,I1eec7a73,Iccb4e72c, ...
* changes:
Removed line deemed incompatible with Dialer open source.
Avoid updating system call log cache when the call log is being built
Make sure we have a host for the search fragment before loading data.
Fix scroll for new favorites
UI refresh for bottom nav bar.
UI refresh for FAB.
Use ConcurrentMap to log Contacts Provider metrics in the old call log.
Also ignore IllegalStateException thrown by SQLiteClosable when coalescing fails.
UI refresh for search fragment.
Add voicemail greeting setting screen to voicemail settings.
Diffstat (limited to 'java/com/android/dialer/theme/common')
-rw-r--r-- | java/com/android/dialer/theme/common/res/values/colors.xml | 2 | ||||
-rw-r--r-- | java/com/android/dialer/theme/common/res/values/text_styles.xml | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/java/com/android/dialer/theme/common/res/values/colors.xml b/java/com/android/dialer/theme/common/res/values/colors.xml index 207d29c80..0af550fce 100644 --- a/java/com/android/dialer/theme/common/res/values/colors.xml +++ b/java/com/android/dialer/theme/common/res/values/colors.xml @@ -27,7 +27,7 @@ <color name="notification_action_dismiss">#A52714</color> <color name="notification_action_answer_video">#097138</color> - <color name="dialer_red">#C53929</color> + <color name="dialer_red">#EA4335</color> <!-- Legacy --> <color name="blue_grey_100">#CFD8DC</color> 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 df5dafa31..1f2d6c728 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 @@ -37,6 +37,12 @@ <item name="android:fontFamily">sans-serif-medium</item> </style> + <style name="Dialer.TextAppearance.SubHeader2" parent="TextAppearance.AppCompat"> + <item name="android:textColor">?android:attr/textColorSecondary</item> + <item name="android:textSize">14sp</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> |