diff options
author | Eric Erfanian <erfanian@google.com> | 2018-05-30 16:17:27 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-05-30 16:17:27 +0000 |
commit | 2c3d81eeac82472d06027bc65d661e16735c8608 (patch) | |
tree | 293aeb0012d8db8f3f4606a75a422cf4da328477 /java/com/android/dialer/app/res/values | |
parent | 4efd0ebf003e985e7cbe40d8ffd9f7ff227a9611 (diff) | |
parent | 152c3fd58f83a1882bcdc8bc55f46bbb8f3173c9 (diff) |
Merge changes Ica13ee39,I5e0fedc8,I8e7efad0,I0ecc1f91,Iee1e658a, ...
* changes:
Drop maps.impl from packages.mk
Check if ID column is null before retrieving data from the smart dial database.
Rename theme/private to theme/hidden.
Some improvements to the answer fragment layouts.
Better a11y for the bottom sheet.
Fix a few UI bugs.
Log IMS video call available state
Better a11y for contact badge in the new call log.
Use lookup key to determine the letter tile color
Use Dialer Light Theme for SpeakEasyFragment
Better a11y for new call log entries.
Use Maps SDK lite mode instead of static API for emergency call.
Updating locations where PrimaryInfo#setPhoto is used to also PrimaryInfo#setPhotoUri for new GlidePhotoManager implementation. As part of this addition, we also are cleaning the setPhoto(null) because this is not explicitly needed.
Converted ThemeUtil into a DaggerModule.
Delete AppCompatConstants
Remove photo support in PhoneNumberService
Began implementation of Dialer dark theme.
Diffstat (limited to 'java/com/android/dialer/app/res/values')
-rw-r--r-- | java/com/android/dialer/app/res/values/colors.xml | 57 | ||||
-rw-r--r-- | java/com/android/dialer/app/res/values/styles.xml | 33 |
2 files changed, 17 insertions, 73 deletions
diff --git a/java/com/android/dialer/app/res/values/colors.xml b/java/com/android/dialer/app/res/values/colors.xml index 2b8d63ac0..a9713474d 100644 --- a/java/com/android/dialer/app/res/values/colors.xml +++ b/java/com/android/dialer/app/res/values/colors.xml @@ -15,67 +15,12 @@ --> <resources> - <color name="dialer_flat_button_text_color">?android:attr/colorPrimary</color> - - <color name="setting_background_color">#ffffff</color> - - <!-- 54% black --> - <color name="call_log_icon_tint">#8a000000</color> - <!-- 87% black --> - <color name="call_log_primary_color">#de000000</color> - <!-- 54% black --> - <color name="call_log_detail_color">#8a000000</color> - <!-- 87% black --> - <color name="call_log_voicemail_transcript_color">#de000000</color> - <!-- 54% black --> - <color name="call_log_voicemail_transcript_branding_color">#8a000000</color> - <!-- 100% blue --> - <color name="call_log_voicemail_transcript_rating_color">#ff2a56c6</color> - <!-- 70% black --> - <color name="call_log_action_color">#b3000000</color> - <!-- 54% black --> - <color name="call_log_day_group_heading_color">#8a000000</color> - <!-- 87% black--> - <color name="call_log_unread_text_color">#de000000</color> - <color name="call_log_list_item_primary_action_icon_tint">@color/call_log_icon_tint</color> - - <color name="voicemail_icon_tint">@color/call_log_icon_tint</color> <color name="voicemail_icon_disabled_tint">#80000000</color> - <color name="voicemail_playpause_icon_tint">@color/voicemail_icon_tint</color> - <!-- Colour of voicemail progress bar to the right of position indicator. --> - <color name="voicemail_playback_seek_bar_yet_to_play">#cecece</color> - <!-- Colour of voicemail progress bar to the left of position indicator. --> - <color name="voicemail_playback_seek_bar_already_played">?android:attr/colorPrimary</color> - - <!-- Background color for search results and call details --> - <color name="background_dialer_results">#f9f9f9</color> - - <!-- Color of the contact name in favorite tiles --> - <color name="contact_tile_name_color">#ffffff</color> - - <color name="contact_list_name_text_color">@color/dialer_primary_text_color</color> - - <color name="remove_text_color">#ffffff</color> + <color name="voicemail_playpause_icon_tint">?colorIcon</color> <!-- Text color for the "Remove" text when a contact is dragged on top of the remove view --> <color name="remove_highlighted_text_color">#FF3F3B</color> - <color name="dialer_dialpad_touch_tint">@color/dialer_theme_color_20pct</color> - - <color name="call_log_action_divider">#eeeeee</color> - <color name="divider_line_color">#D8D8D8</color> - <!-- Colors for blocked numbers list --> - <color name="blocked_number_primary_text_color">@color/dialer_primary_text_color</color> - <color name="blocked_number_secondary_text_color">@color/dialer_secondary_text_color</color> - <color name="blocked_number_icon_tint">#616161</color> - <color name="blocked_number_background">#FFFFFF</color> <color name="blocked_number_block_color">#F44336</color> - <color name="blocked_number_header_color">?android:attr/colorPrimary</color> - <color name="blocked_number_disabled_emergency_background_color">#E0E0E0</color> - <color name="add_blocked_number_icon_color">#bdbdbd</color> - - <color name="voicemail_donation_promo_positive_button_text_color">#FF2A56C6</color> - <color name="voicemail_donation_promo_negative_button_text_color">#FF757575</color> - </resources> diff --git a/java/com/android/dialer/app/res/values/styles.xml b/java/com/android/dialer/app/res/values/styles.xml index 54d18f103..c2cad315c 100644 --- a/java/com/android/dialer/app/res/values/styles.xml +++ b/java/com/android/dialer/app/res/values/styles.xml @@ -15,7 +15,9 @@ ~ limitations under the License --> <resources> - <style name="DialtactsTheme" parent="Dialer.ThemeBase"/> + <style name="DialtactsTheme" parent="Dialer.ThemeBase.ActionBar"> + <!-- todo(calderwoodra): fill this in with dialpad theme and call log card theme --> + </style> <style name="DialpadTheme" parent="DialtactsTheme"> <item name="android:textColorPrimary">?android:attr/textColorPrimaryInverse</item> @@ -32,13 +34,13 @@ <!-- Text in the action bar at the top of the screen --> <style name="DialtactsActionBarTitleText" parent="@android:style/TextAppearance.Material.Widget.ActionBar.Title"> - <item name="android:textColor">@color/actionbar_text_color</item> + <item name="android:textColor">?colorTextOnUnthemedDarkBackground</item> </style> <!-- Text style for tabs. --> <style name="DialtactsActionBarTabTextStyle" parent="android:style/Widget.Material.Light.ActionBar.TabText"> - <item name="android:textColor">@color/tab_text_color</item> + <item name="android:textColor">?colorTextOnUnthemedDarkBackground</item> <item name="android:textSize">@dimen/tab_text_size</item> <item name="android:fontFamily">"sans-serif-medium"</item> </style> @@ -51,29 +53,29 @@ <item name="android:gravity">center_vertical</item> </style> - <style name="CallLogActionTextStyle"> + <style name="CallLogActionTextStyle" parent="Dialer.TextAppearance.Primary.Ellipsize"> <item name="android:layout_width">match_parent</item> <item name="android:layout_height">wrap_content</item> <item name="android:paddingStart">@dimen/call_log_action_horizontal_padding</item> <item name="android:paddingEnd">@dimen/call_log_action_horizontal_padding</item> - <item name="android:textColor">@color/call_log_action_color</item> - <item name="android:textSize">@dimen/call_log_primary_text_size</item> - <item name="android:fontFamily">"sans-serif"</item> <item name="android:focusable">true</item> - <item name="android:singleLine">true</item> <item name="android:importantForAccessibility">no</item> </style> - <style name="CallLogActionSupportTextStyle" parent="@style/CallLogActionTextStyle"> - <item name="android:textSize">@dimen/call_log_detail_text_size</item> - <item name="android:textColor">@color/call_log_detail_color</item> + <style name="CallLogActionSupportTextStyle" parent="Dialer.TextAppearance.Secondary.Ellipsize"> + <item name="android:layout_width">match_parent</item> + <item name="android:layout_height">wrap_content</item> + <item name="android:paddingStart">@dimen/call_log_action_horizontal_padding</item> + <item name="android:paddingEnd">@dimen/call_log_action_horizontal_padding</item> + <item name="android:focusable">true</item> + <item name="android:importantForAccessibility">no</item> </style> <style name="CallLogActionIconStyle"> <item name="android:layout_width">@dimen/call_log_action_icon_dimen</item> <item name="android:layout_height">@dimen/call_log_action_icon_dimen</item> <item name="android:layout_marginStart">@dimen/call_log_action_icon_margin_start</item> - <item name="android:tint">?android:attr/textColorSecondary</item> + <item name="android:tint">?colorIcon</item> <item name="android:importantForAccessibility">no</item> </style> @@ -122,7 +124,7 @@ <item name="android:background">?android:attr/selectableItemBackground</item> <item name="android:paddingEnd">@dimen/button_horizontal_padding</item> <item name="android:paddingStart">@dimen/button_horizontal_padding</item> - <item name="android:textColor">@color/dialer_flat_button_text_color</item> + <item name="android:textColor">?android:attr/colorPrimary</item> </style> <!-- Style for the 'primary' button in a view. Unlike the DialerFlatButtonStyle, this button --> @@ -147,9 +149,7 @@ <item name="android:background">?android:attr/listDivider</item> </style> - <style name="TranscriptionQualityRating"> - <item name="android:textColor">@color/call_log_voicemail_transcript_branding_color</item> - <item name="android:textSize">@dimen/call_log_voicemail_transcription_text_size</item> + <style name="TranscriptionQualityRating" parent="Dialer.TextAppearance.Secondary"> <item name="android:textStyle">italic</item> <item name="android:paddingRight">20dp</item> <item name="android:minHeight">56dp</item> @@ -167,5 +167,4 @@ <item name="android:textColor">?android:attr/colorPrimary</item> <item name="android:fontFamily">"sans-serif-medium"</item> </style> - </resources> |