From c5c42189eeab0389a94717de9a66c6d00068e8bf Mon Sep 17 00:00:00 2001 From: calderwoodra Date: Tue, 22 May 2018 15:30:39 -0700 Subject: Began implementation of Dialer dark theme. - README on how to properly theme Dialer going forward. - Migrated all widgets to use global colors. - Removed all activity and application themes where it wasn't necessary. - Added themeing test rule for Espresso tests. Bug: 79883035 Test: tap PiperOrigin-RevId: 197634256 Change-Id: I4b7d94d45aeeb59d484b0069fdd1e200a654910b --- .../contacts/common/list/ViewPagerTabStrip.java | 2 +- .../contacts/common/list/ViewPagerTabs.java | 2 +- .../contacts/common/res/color/tab_text_color.xml | 21 --- .../res/drawable/dialog_background_material.xml | 2 +- .../res/drawable/ic_scroll_handle_default.xml | 2 +- .../item_background_material_borderless_dark.xml | 19 --- .../res/drawable/item_background_material_dark.xml | 23 --- .../drawable/item_background_material_light.xml | 23 --- .../res/drawable/unread_count_background.xml | 2 +- .../res/drawable/view_pager_tab_background.xml | 22 --- .../common/res/layout-ldrtl/unread_count_tab.xml | 4 +- .../common/res/layout/account_filter_header.xml | 2 +- .../res/layout/call_subject_history_list_item.xml | 2 +- .../common/res/layout/contact_list_card.xml | 6 +- .../common/res/layout/default_account_checkbox.xml | 2 +- .../common/res/layout/dialog_call_subject.xml | 12 +- .../common/res/layout/search_bar_expanded.xml | 8 +- .../common/res/layout/select_account_list_item.xml | 6 +- .../common/res/layout/unread_count_tab.xml | 4 +- .../android/contacts/common/res/values/colors.xml | 48 ------ .../android/contacts/common/res/values/styles.xml | 4 +- .../dialer/app/calllog/PhoneCallDetailsHelper.java | 15 +- .../calllog/VisualVoicemailCallLogFragment.java | 1 - .../app/filterednumber/BlockedNumbersFragment.java | 4 +- java/com/android/dialer/app/list/RemoveView.java | 2 +- .../dialer/app/res/drawable/rounded_corner.xml | 2 +- .../dialer/app/res/drawable/seekbar_drawable.xml | 8 +- .../empty_content_view_dialpad_search.xml | 3 +- .../app/res/layout/blocked_number_footer.xml | 3 +- .../app/res/layout/blocked_number_fragment.xml | 2 +- .../app/res/layout/blocked_number_header.xml | 14 +- .../dialer/app/res/layout/blocked_number_item.xml | 11 +- .../dialer/app/res/layout/call_log_activity.xml | 2 +- .../dialer/app/res/layout/call_log_fragment.xml | 3 +- .../dialer/app/res/layout/call_log_list_item.xml | 30 ++-- .../app/res/layout/call_log_list_item_actions.xml | 2 +- .../dialer/app/res/layout/dialtacts_activity.xml | 4 +- .../layout/empty_content_view_dialpad_search.xml | 5 +- .../dialer/app/res/layout/lists_fragment.xml | 6 +- .../app/res/layout/phone_favorite_tile_view.xml | 6 +- .../dialer/app/res/layout/search_edittext.xml | 7 +- .../res/layout/view_numbers_to_import_fragment.xml | 2 +- .../app/res/layout/voicemail_playback_layout.xml | 10 +- .../android/dialer/app/res/values-v27/styles.xml | 2 +- java/com/android/dialer/app/res/values/colors.xml | 57 +------ java/com/android/dialer/app/res/values/styles.xml | 33 ++-- .../res/layout/block_report_spam_dialog.xml | 3 +- .../res/layout/call_composer_activity.xml | 13 +- .../res/layout/fragment_message_composer.xml | 2 +- .../callcomposer/res/layout/permission_view.xml | 2 +- .../dialer/callcomposer/res/values/styles.xml | 6 +- .../android/dialer/calldetails/AndroidManifest.xml | 6 +- .../calldetails/CallDetailsEntryViewHolder.java | 2 +- .../calldetails/res/layout/call_details_entry.xml | 13 +- .../calldetails/res/layout/call_details_footer.xml | 7 +- .../res/layout/caller_id_report_dialog.xml | 4 +- .../calldetails/res/layout/contact_container.xml | 10 +- .../calldetails/res/layout/ec_data_container.xml | 7 +- .../dialer/calldetails/res/values/styles.xml | 5 +- .../dialer/calllog/ui/NewCallLogFragment.java | 1 - .../calllog/ui/res/layout/new_call_log_entry.xml | 18 +-- .../calllog/ui/res/layout/new_call_log_header.xml | 2 +- .../ui/res/layout/new_call_log_promotion_card.xml | 7 +- .../dialer/calllog/ui/res/values/colors.xml | 3 +- .../dialer/calllog/ui/res/values/strings.xml | 1 + .../dialer/calllog/ui/res/values/styles.xml | 25 +-- .../dialer/calllogutils/CallTypeIconsView.java | 8 +- .../dialer/calllogutils/res/values/colors.xml | 4 - .../res/drawable/fast_scroller_scroll_bar.xml | 2 +- .../res/layout/add_contact_row.xml | 1 - .../contactsfragment/res/layout/contact_row.xml | 2 +- .../res/layout/fragment_contacts.xml | 4 +- .../dialer/contactsfragment/res/layout/header.xml | 3 +- .../res/layout-land/dialpad_fragment.xml | 2 +- .../dialpadview/res/layout/dialpad_fragment.xml | 6 +- .../res/layout/dialpad_view_unthemed.xml | 8 +- .../dialer/dialpadview/theme/res/values/attr.xml | 2 - .../dialer/dialpadview/theme/res/values/styles.xml | 10 -- .../enrichedcall/simulator/AndroidManifest.xml | 3 +- .../HistoryItemActionBottomSheet.java | 6 +- .../res/layout/contact_layout.xml | 4 +- .../res/layout/module_layout.xml | 2 +- .../historyitemactions/res/values/styles.xml | 2 +- java/com/android/dialer/inject/ContextModule.java | 2 +- .../dialer/main/impl/OldMainActivityPeer.java | 19 +++ .../dialer/main/impl/bottomnav/BottomNavItem.java | 2 +- .../bottomnav/res/drawable/notification_badge.xml | 2 +- .../impl/bottomnav/res/layout/bottom_nav_item.xml | 5 +- .../impl/res/layout/promotion_bottom_sheet.xml | 7 +- .../dialer/main/impl/res/values-v27/styles.xml | 9 ++ .../android/dialer/main/impl/res/values/styles.xml | 11 ++ .../toolbar/res/drawable/search_bar_background.xml | 2 +- .../search_bar_background_rounded_corners.xml | 2 +- .../toolbar/res/layout/expanded_search_bar.xml | 4 +- .../impl/toolbar/res/layout/toolbar_layout.xml | 13 +- .../android/dialer/postcall/AndroidManifest.xml | 1 - java/com/android/dialer/rtt/AndroidManifest.xml | 3 +- .../dialer/rtt/res/color/bubble_background.xml | 2 +- .../dialer/rtt/res/drawable/message_bubble.xml | 2 +- .../common/res/layout/search_contact_row.xml | 3 +- .../list/res/layout/fragment_search.xml | 4 +- .../list/res/layout/header_layout.xml | 2 +- .../res/layout/location_permission_row.xml | 3 +- .../res/drawable/ic_add_contact_foreground.xml | 3 +- .../res/drawable/ic_shortcut_add_contact.xml | 4 +- .../res/drawable/context_menu_background.xml | 26 ---- .../res/drawable/context_menu_contact_icon.xml | 2 +- .../res/layout/disambig_dialog_layout.xml | 2 +- .../speeddial/res/layout/fragment_speed_dial.xml | 2 +- .../speeddial/res/layout/suggestion_row_layout.xml | 2 +- .../res/menu/starred_contact_context_menu.xml | 8 +- .../android/dialer/speeddial/res/values/styles.xml | 2 +- java/com/android/dialer/theme/AndroidManifest.xml | 3 - java/com/android/dialer/theme/README.md | 75 +++++++++ java/com/android/dialer/theme/ThemeUtil.java | 110 -------------- .../dialer/theme/attributes/AndroidManifest.xml | 16 -- .../dialer/theme/attributes/res/values/attr.xml | 21 --- .../android/dialer/theme/base/AndroidManifest.xml | 16 ++ java/com/android/dialer/theme/base/ThemeUtil.java | 169 +++++++++++++++++++++ .../android/dialer/theme/base/res/values/attr.xml | 26 ++++ .../theme/base/res/values/styles_dialer_light.xml | 53 +++++++ .../theme/base/res/values/theme_dialer_dark.xml | 64 ++++++++ .../theme/base/res/values/theme_dialer_light.xml | 81 ++++++++++ .../dialer/theme/common/AndroidManifest.xml | 16 ++ .../anim/front_back_switch_button_animation.xml | 29 ++++ .../res/animator/activated_button_elevation.xml | 36 +++++ .../common/res/drawable-hdpi/empty_speed_dial.png | Bin 0 -> 3022 bytes .../common/res/drawable-mdpi/empty_speed_dial.png | Bin 0 -> 2042 bytes .../common/res/drawable-xhdpi/empty_speed_dial.png | Bin 0 -> 4490 bytes .../res/drawable-xxhdpi/empty_speed_dial.png | Bin 0 -> 5368 bytes .../res/drawable/front_back_switch_button.xml | 90 +++++++++++ .../front_back_switch_button_animation.xml | 23 +++ .../item_background_material_borderless_dark.xml | 19 +++ .../dialer/theme/common/res/values/colors.xml | 33 ++++ .../dialer/theme/common/res/values/dimens.xml | 57 +++++++ .../dialer/theme/common/res/values/strings.xml | 47 ++++++ .../dialer/theme/common/res/values/styles.xml | 34 +++++ .../dialer/theme/common/res/values/text_styles.xml | 87 +++++++++++ .../dialer/theme/private/AndroidManifest.xml | 16 ++ .../res/color/dialer_dark_primary_text_color.xml | 21 +++ .../res/color/dialer_dark_secondary_text_color.xml | 21 +++ .../res/color/dialer_primary_text_color.xml | 21 +++ .../res/color/dialer_secondary_text_color.xml | 21 +++ .../res/color/settings_text_color_primary.xml | 23 +++ .../res/color/settings_text_color_secondary.xml | 23 +++ .../private/res/values/colors_dialer_dark.xml | 40 +++++ .../private/res/values/colors_dialer_light.xml | 51 +++++++ .../dialer/theme/private/res/values/styles.xml | 55 +++++++ .../anim/front_back_switch_button_animation.xml | 14 -- .../res/animator/activated_button_elevation.xml | 21 --- .../theme/res/color/dialer_primary_text_color.xml | 21 --- .../res/color/dialer_secondary_text_color.xml | 21 --- .../res/color/settings_text_color_primary.xml | 23 --- .../res/color/settings_text_color_secondary.xml | 23 --- .../theme/res/drawable-hdpi/empty_speed_dial.png | Bin 3022 -> 0 bytes .../theme/res/drawable-mdpi/empty_speed_dial.png | Bin 2042 -> 0 bytes .../theme/res/drawable-xhdpi/empty_speed_dial.png | Bin 4490 -> 0 bytes .../theme/res/drawable-xxhdpi/empty_speed_dial.png | Bin 5368 -> 0 bytes .../res/drawable/front_back_switch_button.xml | 75 --------- .../front_back_switch_button_animation.xml | 8 - .../com/android/dialer/theme/res/values/colors.xml | 31 ---- .../theme/res/values/colors_dialer_light.xml | 55 ------- .../com/android/dialer/theme/res/values/dimens.xml | 61 -------- .../android/dialer/theme/res/values/strings.xml | 47 ------ .../theme/res/values/styles_dialer_light.xml | 110 -------------- .../voicemail/listui/NewVoicemailFragment.java | 1 - .../layout/voicemail_error_message_fragment.xml | 7 +- .../voicemail/listui/error/res/values/styles.xml | 4 +- .../listui/res/layout/new_voicemail_entry.xml | 14 +- .../res/layout/new_voicemail_entry_alert.xml | 7 +- .../res/layout/new_voicemail_entry_header.xml | 2 +- .../dialer/voicemail/listui/res/values/styles.xml | 2 +- .../android/dialer/widget/EmptyContentView.java | 11 +- .../widget/res/drawable/ripple_material_light.xml | 23 --- .../widget/res/layout-land/empty_content_view.xml | 2 +- .../widget/res/layout/contact_photo_view.xml | 2 +- .../dialer/widget/res/layout/dialer_toolbar.xml | 12 +- .../widget/res/layout/empty_content_view.xml | 2 +- .../dialer/widget/res/layout/fragment_message.xml | 2 +- .../widget/res/layout/selectable_text_view.xml | 5 +- .../android/dialer/widget/res/values/colors.xml | 24 --- .../res/layout/swipe_up_down_method.xml | 2 +- .../impl/res/layout/fragment_incoming_call.xml | 1 + .../audioroute/res/layout/audioroute_item.xml | 2 +- java/com/android/incallui/call/DialerCall.java | 2 +- .../impl/res/layout/location_fragment.xml | 2 +- .../incallui/commontheme/res/values/colors.xml | 2 - .../incall/impl/res/color/incall_button_icon.xml | 4 +- .../res/layout/frag_rtt_request_dialog.xml | 2 +- .../res/color/submit_button_background_color.xml | 21 --- .../impl/res/drawable/incallui_message_bubble.xml | 21 +++ .../rtt/impl/res/drawable/message_bubble.xml | 21 --- .../incallui/rtt/impl/res/layout/audio_route.xml | 2 +- .../incallui/rtt/impl/res/layout/frag_rtt_chat.xml | 4 +- .../incallui/rtt/impl/res/layout/rtt_banner.xml | 6 +- .../res/layout/fragment_composer_text.xml | 2 +- .../sessiondata/res/layout/fragment_spam.xml | 5 +- .../frag_international_call_on_wifi_dialog.xml | 4 +- .../android/incallui/theme/res/values/styles.xml | 4 +- .../res/layout/frag_video_charges_alert_dialog.xml | 4 +- .../video/impl/res/layout/frag_videocall.xml | 4 +- .../impl/res/layout/frag_videocall_surfaceview.xml | 4 +- .../incallui/video/impl/res/values/colors.xml | 20 --- .../incallui/video/impl/res/values/styles.xml | 2 +- packages.mk | 3 + 205 files changed, 1584 insertions(+), 1392 deletions(-) delete mode 100644 java/com/android/contacts/common/res/color/tab_text_color.xml delete mode 100644 java/com/android/contacts/common/res/drawable/item_background_material_borderless_dark.xml delete mode 100644 java/com/android/contacts/common/res/drawable/item_background_material_dark.xml delete mode 100644 java/com/android/contacts/common/res/drawable/item_background_material_light.xml delete mode 100644 java/com/android/contacts/common/res/drawable/view_pager_tab_background.xml delete mode 100644 java/com/android/dialer/speeddial/res/drawable/context_menu_background.xml delete mode 100644 java/com/android/dialer/theme/AndroidManifest.xml create mode 100644 java/com/android/dialer/theme/README.md delete mode 100644 java/com/android/dialer/theme/ThemeUtil.java delete mode 100644 java/com/android/dialer/theme/attributes/AndroidManifest.xml delete mode 100644 java/com/android/dialer/theme/attributes/res/values/attr.xml create mode 100644 java/com/android/dialer/theme/base/AndroidManifest.xml create mode 100644 java/com/android/dialer/theme/base/ThemeUtil.java create mode 100644 java/com/android/dialer/theme/base/res/values/attr.xml create mode 100644 java/com/android/dialer/theme/base/res/values/styles_dialer_light.xml create mode 100644 java/com/android/dialer/theme/base/res/values/theme_dialer_dark.xml create mode 100644 java/com/android/dialer/theme/base/res/values/theme_dialer_light.xml create mode 100644 java/com/android/dialer/theme/common/AndroidManifest.xml create mode 100644 java/com/android/dialer/theme/common/res/anim/front_back_switch_button_animation.xml create mode 100644 java/com/android/dialer/theme/common/res/animator/activated_button_elevation.xml create mode 100644 java/com/android/dialer/theme/common/res/drawable-hdpi/empty_speed_dial.png create mode 100644 java/com/android/dialer/theme/common/res/drawable-mdpi/empty_speed_dial.png create mode 100644 java/com/android/dialer/theme/common/res/drawable-xhdpi/empty_speed_dial.png create mode 100644 java/com/android/dialer/theme/common/res/drawable-xxhdpi/empty_speed_dial.png create mode 100644 java/com/android/dialer/theme/common/res/drawable/front_back_switch_button.xml create mode 100644 java/com/android/dialer/theme/common/res/drawable/front_back_switch_button_animation.xml create mode 100644 java/com/android/dialer/theme/common/res/drawable/item_background_material_borderless_dark.xml create mode 100644 java/com/android/dialer/theme/common/res/values/colors.xml create mode 100644 java/com/android/dialer/theme/common/res/values/dimens.xml create mode 100644 java/com/android/dialer/theme/common/res/values/strings.xml create mode 100644 java/com/android/dialer/theme/common/res/values/styles.xml create mode 100644 java/com/android/dialer/theme/common/res/values/text_styles.xml create mode 100644 java/com/android/dialer/theme/private/AndroidManifest.xml create mode 100644 java/com/android/dialer/theme/private/res/color/dialer_dark_primary_text_color.xml create mode 100644 java/com/android/dialer/theme/private/res/color/dialer_dark_secondary_text_color.xml create mode 100644 java/com/android/dialer/theme/private/res/color/dialer_primary_text_color.xml create mode 100644 java/com/android/dialer/theme/private/res/color/dialer_secondary_text_color.xml create mode 100644 java/com/android/dialer/theme/private/res/color/settings_text_color_primary.xml create mode 100644 java/com/android/dialer/theme/private/res/color/settings_text_color_secondary.xml create mode 100644 java/com/android/dialer/theme/private/res/values/colors_dialer_dark.xml create mode 100644 java/com/android/dialer/theme/private/res/values/colors_dialer_light.xml create mode 100644 java/com/android/dialer/theme/private/res/values/styles.xml delete mode 100644 java/com/android/dialer/theme/res/anim/front_back_switch_button_animation.xml delete mode 100644 java/com/android/dialer/theme/res/animator/activated_button_elevation.xml delete mode 100644 java/com/android/dialer/theme/res/color/dialer_primary_text_color.xml delete mode 100644 java/com/android/dialer/theme/res/color/dialer_secondary_text_color.xml delete mode 100644 java/com/android/dialer/theme/res/color/settings_text_color_primary.xml delete mode 100644 java/com/android/dialer/theme/res/color/settings_text_color_secondary.xml delete mode 100644 java/com/android/dialer/theme/res/drawable-hdpi/empty_speed_dial.png delete mode 100644 java/com/android/dialer/theme/res/drawable-mdpi/empty_speed_dial.png delete mode 100644 java/com/android/dialer/theme/res/drawable-xhdpi/empty_speed_dial.png delete mode 100644 java/com/android/dialer/theme/res/drawable-xxhdpi/empty_speed_dial.png delete mode 100644 java/com/android/dialer/theme/res/drawable/front_back_switch_button.xml delete mode 100644 java/com/android/dialer/theme/res/drawable/front_back_switch_button_animation.xml delete mode 100644 java/com/android/dialer/theme/res/values/colors.xml delete mode 100644 java/com/android/dialer/theme/res/values/colors_dialer_light.xml delete mode 100644 java/com/android/dialer/theme/res/values/dimens.xml delete mode 100644 java/com/android/dialer/theme/res/values/strings.xml delete mode 100644 java/com/android/dialer/theme/res/values/styles_dialer_light.xml delete mode 100644 java/com/android/dialer/widget/res/drawable/ripple_material_light.xml delete mode 100644 java/com/android/dialer/widget/res/values/colors.xml delete mode 100644 java/com/android/incallui/rtt/impl/res/color/submit_button_background_color.xml create mode 100644 java/com/android/incallui/rtt/impl/res/drawable/incallui_message_bubble.xml delete mode 100644 java/com/android/incallui/rtt/impl/res/drawable/message_bubble.xml delete mode 100644 java/com/android/incallui/video/impl/res/values/colors.xml diff --git a/java/com/android/contacts/common/list/ViewPagerTabStrip.java b/java/com/android/contacts/common/list/ViewPagerTabStrip.java index 8835631f5..fa345e42d 100644 --- a/java/com/android/contacts/common/list/ViewPagerTabStrip.java +++ b/java/com/android/contacts/common/list/ViewPagerTabStrip.java @@ -24,7 +24,7 @@ import android.util.AttributeSet; import android.view.View; import android.widget.LinearLayout; import com.android.contacts.common.R; -import com.android.dialer.theme.ThemeUtil; +import com.android.dialer.theme.base.ThemeUtil; public class ViewPagerTabStrip extends LinearLayout { diff --git a/java/com/android/contacts/common/list/ViewPagerTabs.java b/java/com/android/contacts/common/list/ViewPagerTabs.java index 1e6cf1354..f48fd29ca 100644 --- a/java/com/android/contacts/common/list/ViewPagerTabs.java +++ b/java/com/android/contacts/common/list/ViewPagerTabs.java @@ -163,7 +163,7 @@ public class ViewPagerTabs extends HorizontalScrollView implements ViewPager.OnP } else { final TextView textView = new TextView(getContext()); textView.setText(tabTitle); - textView.setBackgroundResource(R.drawable.view_pager_tab_background); + textView.setClickable(true); // Assign various text appearance related attributes to child views. if (mTextStyle > 0) { diff --git a/java/com/android/contacts/common/res/color/tab_text_color.xml b/java/com/android/contacts/common/res/color/tab_text_color.xml deleted file mode 100644 index 71ef3e903..000000000 --- a/java/com/android/contacts/common/res/color/tab_text_color.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/java/com/android/contacts/common/res/drawable/dialog_background_material.xml b/java/com/android/contacts/common/res/drawable/dialog_background_material.xml index 1b71cd63a..c93d43ea6 100644 --- a/java/com/android/contacts/common/res/drawable/dialog_background_material.xml +++ b/java/com/android/contacts/common/res/drawable/dialog_background_material.xml @@ -18,6 +18,6 @@ android:inset="16dp"> - + diff --git a/java/com/android/contacts/common/res/drawable/ic_scroll_handle_default.xml b/java/com/android/contacts/common/res/drawable/ic_scroll_handle_default.xml index ac932f87c..9164ab1ab 100644 --- a/java/com/android/contacts/common/res/drawable/ic_scroll_handle_default.xml +++ b/java/com/android/contacts/common/res/drawable/ic_scroll_handle_default.xml @@ -17,4 +17,4 @@ + android:tint="?colorIcon"/> diff --git a/java/com/android/contacts/common/res/drawable/item_background_material_borderless_dark.xml b/java/com/android/contacts/common/res/drawable/item_background_material_borderless_dark.xml deleted file mode 100644 index 94e309507..000000000 --- a/java/com/android/contacts/common/res/drawable/item_background_material_borderless_dark.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - \ No newline at end of file diff --git a/java/com/android/contacts/common/res/drawable/item_background_material_dark.xml b/java/com/android/contacts/common/res/drawable/item_background_material_dark.xml deleted file mode 100644 index 91ab763a5..000000000 --- a/java/com/android/contacts/common/res/drawable/item_background_material_dark.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/java/com/android/contacts/common/res/drawable/item_background_material_light.xml b/java/com/android/contacts/common/res/drawable/item_background_material_light.xml deleted file mode 100644 index d41accb02..000000000 --- a/java/com/android/contacts/common/res/drawable/item_background_material_light.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/java/com/android/contacts/common/res/drawable/unread_count_background.xml b/java/com/android/contacts/common/res/drawable/unread_count_background.xml index 4fc6b9b60..b58baef7c 100644 --- a/java/com/android/contacts/common/res/drawable/unread_count_background.xml +++ b/java/com/android/contacts/common/res/drawable/unread_count_background.xml @@ -17,5 +17,5 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - + diff --git a/java/com/android/contacts/common/res/drawable/view_pager_tab_background.xml b/java/com/android/contacts/common/res/drawable/view_pager_tab_background.xml deleted file mode 100644 index bef30a434..000000000 --- a/java/com/android/contacts/common/res/drawable/view_pager_tab_background.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/java/com/android/contacts/common/res/layout-ldrtl/unread_count_tab.xml b/java/com/android/contacts/common/res/layout-ldrtl/unread_count_tab.xml index 9e9be95e3..51d56bb22 100644 --- a/java/com/android/contacts/common/res/layout-ldrtl/unread_count_tab.xml +++ b/java/com/android/contacts/common/res/layout-ldrtl/unread_count_tab.xml @@ -19,7 +19,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/view_pager_tab_background" + android:background="@drawable/item_background_material_borderless_dark" android:layoutDirection="ltr"> diff --git a/java/com/android/contacts/common/res/layout/account_filter_header.xml b/java/com/android/contacts/common/res/layout/account_filter_header.xml index a12ab08fd..592c240a9 100644 --- a/java/com/android/contacts/common/res/layout/account_filter_header.xml +++ b/java/com/android/contacts/common/res/layout/account_filter_header.xml @@ -23,7 +23,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background_primary"> + android:background="?android:attr/colorBackground"> diff --git a/java/com/android/contacts/common/res/layout/contact_list_card.xml b/java/com/android/contacts/common/res/layout/contact_list_card.xml index a04f4cad9..37bb8ea27 100644 --- a/java/com/android/contacts/common/res/layout/contact_list_card.xml +++ b/java/com/android/contacts/common/res/layout/contact_list_card.xml @@ -24,16 +24,16 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="@integer/contact_list_space_layout_weight" - android:background="@color/background_primary"/> + android:background="?android:attr/colorBackground"/> + android:background="?android:attr/colorBackground"/> diff --git a/java/com/android/contacts/common/res/layout/default_account_checkbox.xml b/java/com/android/contacts/common/res/layout/default_account_checkbox.xml index 1e76b74f5..911098397 100644 --- a/java/com/android/contacts/common/res/layout/default_account_checkbox.xml +++ b/java/com/android/contacts/common/res/layout/default_account_checkbox.xml @@ -44,7 +44,7 @@ android:text="@string/set_default_account" android:textAlignment="viewStart" android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="@color/dialer_secondary_text_color" + android:textColor="?android:attr/textColorSecondary" /> diff --git a/java/com/android/contacts/common/res/layout/dialog_call_subject.xml b/java/com/android/contacts/common/res/layout/dialog_call_subject.xml index df8e8d299..d20aa3b45 100644 --- a/java/com/android/contacts/common/res/layout/dialog_call_subject.xml +++ b/java/com/android/contacts/common/res/layout/dialog_call_subject.xml @@ -67,7 +67,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" - android:textColor="@color/dialer_primary_text_color" + android:textColor="?android:attr/textColorPrimary" android:textSize="@dimen/call_subject_dialog_secondary_text_size"/> @@ -94,7 +94,7 @@ android:background="@null" android:gravity="top" android:hint="@string/call_subject_hint" - android:textColor="@color/dialer_secondary_text_color" + android:textColor="?android:attr/textColorSecondary" android:textSize="@dimen/call_subject_dialog_secondary_text_size" /> @@ -107,7 +107,7 @@ android:layout_marginStart="@dimen/call_subject_dialog_margin" android:layout_marginEnd="@dimen/call_subject_dialog_margin" android:singleLine="true" - android:textColor="@color/dialer_secondary_text_color" + android:textColor="?android:attr/textColorSecondary" android:textSize="@dimen/call_subject_dialog_secondary_text_size"/> + android:tint="?colorIcon"/> diff --git a/java/com/android/contacts/common/res/layout/search_bar_expanded.xml b/java/com/android/contacts/common/res/layout/search_bar_expanded.xml index ccea3f76f..c9ab6a92d 100644 --- a/java/com/android/contacts/common/res/layout/search_bar_expanded.xml +++ b/java/com/android/contacts/common/res/layout/search_bar_expanded.xml @@ -29,7 +29,7 @@ android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/action_menu_back_from_search" android:src="@drawable/back_arrow" - android:tint="@color/contactscommon_actionbar_background_color"/> + android:tint="?colorTextOnUnthemedDarkBackground"/> @@ -60,5 +60,5 @@ android:clickable="true" android:contentDescription="@string/description_clear_search" android:src="@drawable/quantum_ic_close_vd_theme_24" - android:tint="@color/searchbox_icon_tint"/> + android:tint="?colorIcon"/> diff --git a/java/com/android/contacts/common/res/layout/select_account_list_item.xml b/java/com/android/contacts/common/res/layout/select_account_list_item.xml index 98e7c5454..e77c53c7e 100644 --- a/java/com/android/contacts/common/res/layout/select_account_list_item.xml +++ b/java/com/android/contacts/common/res/layout/select_account_list_item.xml @@ -46,7 +46,7 @@ android:layout_height="wrap_content" android:includeFontPadding="false" android:textAppearance="?android:attr/textAppearanceMedium" - android:textColor="@color/dialer_primary_text_color"/> + android:textColor="?android:attr/textColorPrimary"/> diff --git a/java/com/android/contacts/common/res/layout/unread_count_tab.xml b/java/com/android/contacts/common/res/layout/unread_count_tab.xml index 83481ee2d..d8357f491 100644 --- a/java/com/android/contacts/common/res/layout/unread_count_tab.xml +++ b/java/com/android/contacts/common/res/layout/unread_count_tab.xml @@ -16,7 +16,7 @@ + android:background="@drawable/item_background_material_borderless_dark"> diff --git a/java/com/android/contacts/common/res/values/colors.xml b/java/com/android/contacts/common/res/values/colors.xml index b05c19a83..ab9f19b29 100644 --- a/java/com/android/contacts/common/res/values/colors.xml +++ b/java/com/android/contacts/common/res/values/colors.xml @@ -15,20 +15,6 @@ --> - - #a0ffffff - - - #30000000 - - - #363636 - - @color/dialer_secondary_text_color - - - #2A56C6 - #363636 @@ -51,36 +37,6 @@ #424242 - ?android:attr/colorPrimary - - #ffffff - @color/tab_ripple_color - #f50057 - #1C3AA9 - - - @color/contactscommon_actionbar_background_color - - - - #ffffff - #a6ffffff - - - @color/dialer_primary_text_color - - #ffffff - - #737373 - @color/searchbox_hint_text_color - - ?android:attr/colorPrimary - - - #f9f9f9 - #FFFFFF - #d1041c @@ -92,8 +48,4 @@ #00c853 - - - #ffffff - @color/searchbox_hint_text_color diff --git a/java/com/android/contacts/common/res/values/styles.xml b/java/com/android/contacts/common/res/values/styles.xml index bb19afe82..4f0b3f15f 100644 --- a/java/com/android/contacts/common/res/values/styles.xml +++ b/java/com/android/contacts/common/res/values/styles.xml @@ -23,13 +23,13 @@ diff --git a/java/com/android/dialer/app/calllog/PhoneCallDetailsHelper.java b/java/com/android/dialer/app/calllog/PhoneCallDetailsHelper.java index 230c02328..108a11bbe 100644 --- a/java/com/android/dialer/app/calllog/PhoneCallDetailsHelper.java +++ b/java/com/android/dialer/app/calllog/PhoneCallDetailsHelper.java @@ -51,6 +51,7 @@ import com.android.dialer.oem.MotorolaUtils; import com.android.dialer.phonenumberutil.PhoneNumberHelper; import com.android.dialer.spannable.ContentWithLearnMoreSpanner; import com.android.dialer.storage.StorageComponent; +import com.android.dialer.theme.base.ThemeUtil; import com.android.dialer.util.DialerUtils; import com.android.voicemail.VoicemailClient; import com.android.voicemail.VoicemailComponent; @@ -269,9 +270,7 @@ public class PhoneCallDetailsHelper views.voicemailTranscriptionBrandingView.setTypeface(typeface); views.callLocationAndDate.setTypeface(typeface); views.callLocationAndDate.setTextColor( - ContextCompat.getColor( - context, - details.isRead ? R.color.call_log_detail_color : R.color.call_log_unread_text_color)); + details.isRead ? ThemeUtil.getTextColorSecondary() : ThemeUtil.getTextColorPrimary()); } private void setNameView(PhoneCallDetailsViews views, PhoneCallDetails details) { @@ -392,17 +391,11 @@ public class PhoneCallDetailsHelper textView.setMovementMethod(LinkMovementMethod.getInstance()); Button positiveButton = dialog.getButton(DialogInterface.BUTTON_POSITIVE); if (positiveButton != null) { - positiveButton.setTextColor( - context - .getResources() - .getColor(R.color.voicemail_donation_promo_positive_button_text_color)); + positiveButton.setTextColor(ThemeUtil.getColorPrimary()); } Button negativeButton = dialog.getButton(DialogInterface.BUTTON_NEGATIVE); if (negativeButton != null) { - negativeButton.setTextColor( - context - .getResources() - .getColor(R.color.voicemail_donation_promo_negative_button_text_color)); + negativeButton.setTextColor(ThemeUtil.getTextColorSecondary()); } } diff --git a/java/com/android/dialer/app/calllog/VisualVoicemailCallLogFragment.java b/java/com/android/dialer/app/calllog/VisualVoicemailCallLogFragment.java index 5b6eb0387..930edd186 100644 --- a/java/com/android/dialer/app/calllog/VisualVoicemailCallLogFragment.java +++ b/java/com/android/dialer/app/calllog/VisualVoicemailCallLogFragment.java @@ -113,7 +113,6 @@ public class VisualVoicemailCallLogFragment extends CallLogFragment { setupView(view); EmptyContentView emptyContentView = view.findViewById(R.id.empty_list_view); emptyContentView.setImage(R.drawable.quantum_ic_voicemail_vd_theme_24); - emptyContentView.setImageTint(R.color.empty_voicemail_icon_tint_color, null); return view; } diff --git a/java/com/android/dialer/app/filterednumber/BlockedNumbersFragment.java b/java/com/android/dialer/app/filterednumber/BlockedNumbersFragment.java index 270ec6d03..ab03080f4 100644 --- a/java/com/android/dialer/app/filterednumber/BlockedNumbersFragment.java +++ b/java/com/android/dialer/app/filterednumber/BlockedNumbersFragment.java @@ -39,6 +39,7 @@ import com.android.dialer.blocking.FilteredNumbersUtil.CheckForSendToVoicemailCo import com.android.dialer.blocking.FilteredNumbersUtil.ImportSendToVoicemailContactsListener; import com.android.dialer.database.FilteredNumberContract; import com.android.dialer.lettertile.LetterTileDrawable; +import com.android.dialer.theme.base.ThemeUtil; import com.android.dialer.voicemailstatus.VisualVoicemailEnabledChecker; /** TODO(calderwoodra): documentation */ @@ -74,8 +75,7 @@ public class BlockedNumbersFragment extends ListFragment //replace the icon for add number with LetterTileDrawable(), so it will have identical style LetterTileDrawable drawable = new LetterTileDrawable(getResources()); drawable.setLetter(ADD_BLOCKED_NUMBER_ICON_LETTER); - drawable.setColor( - ActivityCompat.getColor(getActivity(), R.color.add_blocked_number_icon_color)); + drawable.setColor(ThemeUtil.getColorIcon()); drawable.setIsCircular(true); if (adapter == null) { diff --git a/java/com/android/dialer/app/list/RemoveView.java b/java/com/android/dialer/app/list/RemoveView.java index ed133d45b..575c5a890 100644 --- a/java/com/android/dialer/app/list/RemoveView.java +++ b/java/com/android/dialer/app/list/RemoveView.java @@ -53,7 +53,7 @@ public class RemoveView extends FrameLayout { removeText = (TextView) findViewById(R.id.remove_view_text); removeIcon = (ImageView) findViewById(R.id.remove_view_icon); final Resources r = getResources(); - unhighlightedColor = r.getColor(R.color.remove_text_color); + unhighlightedColor = r.getColor(android.R.color.white); highlightedColor = r.getColor(R.color.remove_highlighted_text_color); removeDrawable = r.getDrawable(R.drawable.ic_remove); } diff --git a/java/com/android/dialer/app/res/drawable/rounded_corner.xml b/java/com/android/dialer/app/res/drawable/rounded_corner.xml index 97b58b6b1..b4c10066d 100644 --- a/java/com/android/dialer/app/res/drawable/rounded_corner.xml +++ b/java/com/android/dialer/app/res/drawable/rounded_corner.xml @@ -17,6 +17,6 @@ --> - + diff --git a/java/com/android/dialer/app/res/drawable/seekbar_drawable.xml b/java/com/android/dialer/app/res/drawable/seekbar_drawable.xml index e47a6406c..2288cf24a 100644 --- a/java/com/android/dialer/app/res/drawable/seekbar_drawable.xml +++ b/java/com/android/dialer/app/res/drawable/seekbar_drawable.xml @@ -19,7 +19,7 @@ @@ -29,7 +29,7 @@ @@ -42,7 +42,7 @@ @@ -52,7 +52,7 @@ diff --git a/java/com/android/dialer/app/res/layout-land/empty_content_view_dialpad_search.xml b/java/com/android/dialer/app/res/layout-land/empty_content_view_dialpad_search.xml index 59d13636a..bf2a816b0 100644 --- a/java/com/android/dialer/app/res/layout-land/empty_content_view_dialpad_search.xml +++ b/java/com/android/dialer/app/res/layout-land/empty_content_view_dialpad_search.xml @@ -41,8 +41,7 @@ android:paddingLeft="16dp" android:paddingRight="16dp" android:gravity="center_horizontal|top" - android:textColor="@color/empty_list_text_color" - android:textSize="@dimen/empty_list_message_text_size"/> + style="Dialer.TextAppearance.Primary"/> + style="@style/Dialer.TextAppearance.Secondary"/> diff --git a/java/com/android/dialer/app/res/layout/blocked_number_fragment.xml b/java/com/android/dialer/app/res/layout/blocked_number_fragment.xml index 745b913cc..22dcfefa5 100644 --- a/java/com/android/dialer/app/res/layout/blocked_number_fragment.xml +++ b/java/com/android/dialer/app/res/layout/blocked_number_fragment.xml @@ -17,7 +17,7 @@ android:id="@+id/blocked_number_fragment" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/blocked_number_background" + android:background="?android:attr/colorBackground" android:orientation="vertical"> @@ -69,7 +69,7 @@ android:paddingStart="@dimen/blocked_number_container_padding" android:gravity="center_vertical" android:text="@string/block_list" - android:textColor="@color/blocked_number_header_color"/> + android:textColor="?android:attr/textColorPrimary"/>