From 929539eb864822d669265b142bdcc49b6cf8ea6b Mon Sep 17 00:00:00 2001 From: calderwoodra Date: Sat, 19 May 2018 00:05:02 -0700 Subject: Implement a global theme to be easily configured in Dialer. deleted several colors and unified them across the app migrated several alert dialogs to support alert dialogs added many todos migrated several tests from GoogleRobolectricTestRunner to RobolectricTestRunner Because of the test migration: - moved dialpad theme attributes into dialpad/theme - moved incall ui theme attributes into incallui/theme Bug: 79883035 Test: tap PiperOrigin-RevId: 197246477 Change-Id: Ifc534793bc32757bbbf2007a7c40287c8d0817ad --- .../contacts/common/list/ViewPagerTabStrip.java | 5 +- .../res/drawable/ic_scroll_handle_pressed.xml | 2 +- .../res/drawable/searchedittext_custom_cursor.xml | 18 ++- .../android/contacts/common/res/values/colors.xml | 4 +- java/com/android/dialer/about/AndroidManifest.xml | 2 +- java/com/android/dialer/app/AndroidManifest.xml | 6 +- .../app/calllog/BlockReportSpamListener.java | 2 +- .../android/dialer/app/calllog/CallLogAdapter.java | 5 +- .../app/manifests/activities/AndroidManifest.xml | 4 +- .../app/res/color/settings_text_color_primary.xml | 23 --- .../res/color/settings_text_color_secondary.xml | 23 --- .../app/res/drawable/ic_voicemail_seek_handle.xml | 2 +- .../drawable/selectable_primary_flat_button.xml | 2 +- .../dialer/app/res/layout/call_log_activity.xml | 2 +- .../dialer/app/res/layout/call_log_fragment.xml | 2 +- .../dialer/app/res/layout/call_log_list_item.xml | 2 +- .../dialer/app/res/layout/dialtacts_activity.xml | 2 +- .../dialer/app/res/layout/keyguard_preview.xml | 2 +- .../dialer/app/res/layout/lists_fragment.xml | 4 +- .../dialer/app/res/layout/search_edittext.xml | 2 +- .../app/res/layout/voicemail_playback_layout.xml | 2 +- .../android/dialer/app/res/values-v27/styles.xml | 4 +- java/com/android/dialer/app/res/values/colors.xml | 11 +- java/com/android/dialer/app/res/values/styles.xml | 162 ++++----------------- .../dialer/binary/common/DialerApplication.java | 1 - .../android/dialer/blocking/AndroidManifest.xml | 18 ++- .../blockreportspam/BlockReportSpamDialogs.java | 6 +- .../ShowBlockReportSpamDialogReceiver.java | 2 +- .../dialer/callcomposer/AndroidManifest.xml | 2 +- .../cameraui/res/layout/camera_view.xml | 6 +- .../res/drawable/call_composer_contact_border.xml | 2 +- .../drawable/gallery_grid_item_view_background.xml | 2 +- .../drawable/gallery_item_selected_drawable.xml | 6 +- .../res/layout/call_composer_activity.xml | 10 +- .../res/layout/fragment_gallery_composer.xml | 2 +- .../res/layout/fragment_message_composer.xml | 8 +- .../callcomposer/res/layout/permission_view.xml | 4 +- .../dialer/callcomposer/res/values/styles.xml | 3 +- .../android/dialer/calldetails/AndroidManifest.xml | 6 +- .../res/layout/call_details_activity.xml | 2 +- .../calldetails/res/layout/call_details_entry.xml | 10 +- .../calldetails/res/layout/contact_container.xml | 8 +- .../calldetails/res/layout/ec_data_container.xml | 19 ++- .../dialer/calldetails/res/values/styles.xml | 2 +- .../layout/new_call_log_duo_disclosure_card.xml | 4 +- .../calllog/ui/res/layout/new_call_log_entry.xml | 8 +- .../ui/res/layout/new_call_log_fragment.xml | 4 +- .../dialer/calllogutils/CallTypeIconsView.java | 16 +- .../dialer/calllogutils/res/values/colors.xml | 2 - .../fast_scroller_container_background.xml | 2 +- .../res/drawable/fast_scroller_scroll_bar.xml | 2 +- .../res/layout/add_contact_row.xml | 4 +- .../res/layout/fragment_contacts.xml | 4 +- .../dialer/contactsfragment/res/layout/header.xml | 2 +- .../res/layout-land/dialpad_fragment.xml | 2 +- .../res/layout-land/dialpad_key_one.xml | 2 +- .../res/layout/dialpad_chooser_list_item.xml | 3 +- .../dialpadview/res/layout/dialpad_fragment.xml | 2 +- .../dialpadview/res/layout/dialpad_key_one.xml | 2 +- .../dialer/dialpadview/res/values/attrs.xml | 41 ------ .../dialer/dialpadview/res/values/colors.xml | 25 ---- .../dialer/dialpadview/res/values/dimens.xml | 8 - .../dialer/dialpadview/res/values/styles.xml | 37 +---- .../dialer/dialpadview/theme/AndroidManifest.xml | 16 ++ .../dialer/dialpadview/theme/res/values/attr.xml | 40 +++++ .../dialer/dialpadview/theme/res/values/dimens.xml | 27 ++++ .../dialer/dialpadview/theme/res/values/styles.xml | 51 +++++++ .../enrichedcall/simulator/AndroidManifest.xml | 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 | 5 +- .../android/dialer/main/impl/AndroidManifest.xml | 3 +- .../com/android/dialer/main/impl/MainActivity.java | 3 +- .../dialer/main/impl/bottomnav/BottomNavItem.java | 8 +- .../bottomnav/res/drawable/notification_badge.xml | 4 +- .../bottomnav/res/layout/bottom_nav_bar_layout.xml | 2 +- .../impl/bottomnav/res/layout/bottom_nav_item.xml | 6 +- .../main/impl/bottomnav/res/values/colors.xml | 20 --- .../impl/res/layout/promotion_bottom_sheet.xml | 4 +- .../dialer/main/impl/res/values-v27/styles.xml | 5 +- .../dialer/main/impl/res/values/strings.xml | 3 - .../android/dialer/main/impl/res/values/styles.xml | 37 +---- .../impl/toolbar/res/drawable/custom_cursor.xml | 2 +- .../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 | 10 +- .../android/dialer/postcall/AndroidManifest.xml | 6 +- .../postcall/res/layout/post_call_activity.xml | 4 +- .../dialer/precall/impl/res/values/styles.xml | 29 ---- java/com/android/dialer/rtt/AndroidManifest.xml | 3 +- .../common/res/layout/search_contact_row.xml | 4 +- .../list/res/layout/fragment_search.xml | 4 +- .../list/res/layout/header_layout.xml | 2 +- .../list/res/layout/search_action_layout.xml | 4 +- .../res/layout/location_permission_row.xml | 2 +- .../android/dialer/shortcuts/AndroidManifest.xml | 4 +- .../promo/SpamBlockingPromoDialogFragment.java | 6 +- .../dialer/spam/promo/SpamBlockingPromoHelper.java | 2 +- .../res/drawable/context_menu_background.xml | 2 +- .../speeddial/res/drawable/favorite_icon.xml | 4 +- .../res/layout/disambig_dialog_layout.xml | 8 +- .../res/layout/disambig_option_header_layout.xml | 4 +- .../res/layout/disambig_option_layout.xml | 4 +- .../speeddial/res/layout/favorite_item_layout.xml | 4 +- .../speeddial/res/layout/fragment_speed_dial.xml | 2 +- .../res/layout/speed_dial_header_layout.xml | 4 +- .../speeddial/res/layout/suggestion_row_layout.xml | 6 +- .../android/dialer/speeddial/res/values/styles.xml | 2 +- java/com/android/dialer/theme/ThemeUtil.java | 110 ++++++++++++++ .../dialer/theme/attributes/AndroidManifest.xml | 16 ++ .../dialer/theme/attributes/res/values/attr.xml | 21 +++ .../theme/res/color/dialer_primary_text_color.xml | 4 +- .../res/color/dialer_secondary_text_color.xml | 4 +- .../res/color/settings_text_color_primary.xml | 23 +++ .../res/color/settings_text_color_secondary.xml | 23 +++ .../com/android/dialer/theme/res/values/colors.xml | 58 +------- .../theme/res/values/colors_dialer_light.xml | 55 +++++++ .../com/android/dialer/theme/res/values/dimens.xml | 4 + .../com/android/dialer/theme/res/values/styles.xml | 62 -------- .../theme/res/values/styles_dialer_light.xml | 110 ++++++++++++++ .../dialer/theme/res/values/theme_dialer_light.xml | 114 +++++++++++++++ .../com/android/dialer/theme/res/values/themes.xml | 79 ---------- .../voicemail/listui/error/res/values/styles.xml | 6 +- .../res/layout/new_voicemail_call_log_fragment.xml | 2 +- .../listui/res/layout/new_voicemail_entry.xml | 13 +- .../res/layout/new_voicemail_entry_alert.xml | 4 +- .../dialer/widget/res/color/dialer_tint_state.xml | 4 +- .../drawable/contact_photo_badge_background.xml | 4 +- .../widget/res/drawable/edittext_custom_cursor.xml | 2 +- .../dialer/widget/res/layout/dialer_toolbar.xml | 4 +- .../dialer/widget/res/layout/fragment_message.xml | 8 +- .../incallui/ConferenceParticipantListAdapter.java | 11 +- .../android/incallui/PostCharDialogFragment.java | 3 +- .../android/incallui/RttRequestDialogFragment.java | 2 +- .../impl/res/layout/fragment_incoming_call.xml | 2 +- .../incallui/audioroute/res/values/styles.xml | 19 ++- .../impl/res/layout/location_fragment.xml | 2 +- .../incallui/callpending/AndroidManifest.xml | 4 +- .../incallui/commontheme/res/values/styles.xml | 8 +- .../incallui/incall/impl/res/values/dimens.xml | 1 - .../res/drawable/incall_background_gradient.xml | 8 - .../incallui/res/layout/caller_in_conference.xml | 12 +- .../res/layout/frag_rtt_request_dialog.xml | 2 +- java/com/android/incallui/res/values/colors.xml | 70 --------- java/com/android/incallui/res/values/dimens.xml | 44 ------ java/com/android/incallui/res/values/strings.xml | 5 - java/com/android/incallui/res/values/styles.xml | 91 ------------ .../res/drawable/answer_data_background.xml | 2 +- .../res/drawable/spam_container_background.xml | 2 +- .../res/layout/fragment_composer_text.xml | 2 +- .../incallui/spam/SpamNotificationActivity.java | 10 +- .../InternationalCallOnWifiDialogFragment.java | 2 +- .../frag_international_call_on_wifi_dialog.xml | 2 +- .../com/android/incallui/theme/AndroidManifest.xml | 16 ++ .../res/drawable/incall_background_gradient.xml | 23 +++ .../android/incallui/theme/res/values/colors.xml | 70 +++++++++ .../android/incallui/theme/res/values/dimens.xml | 45 ++++++ .../android/incallui/theme/res/values/strings.xml | 21 +++ .../android/incallui/theme/res/values/styles.xml | 84 +++++++++++ .../impl/VideoChargesAlertDialogFragment.java | 2 +- .../res/layout/frag_video_charges_alert_dialog.xml | 2 +- 163 files changed, 1216 insertions(+), 1041 deletions(-) delete mode 100644 java/com/android/dialer/app/res/color/settings_text_color_primary.xml delete mode 100644 java/com/android/dialer/app/res/color/settings_text_color_secondary.xml delete mode 100644 java/com/android/dialer/dialpadview/res/values/attrs.xml delete mode 100644 java/com/android/dialer/dialpadview/res/values/colors.xml create mode 100644 java/com/android/dialer/dialpadview/theme/AndroidManifest.xml create mode 100644 java/com/android/dialer/dialpadview/theme/res/values/attr.xml create mode 100644 java/com/android/dialer/dialpadview/theme/res/values/dimens.xml create mode 100644 java/com/android/dialer/dialpadview/theme/res/values/styles.xml delete mode 100644 java/com/android/dialer/main/impl/bottomnav/res/values/colors.xml delete mode 100644 java/com/android/dialer/precall/impl/res/values/styles.xml create mode 100644 java/com/android/dialer/theme/ThemeUtil.java create mode 100644 java/com/android/dialer/theme/attributes/AndroidManifest.xml create mode 100644 java/com/android/dialer/theme/attributes/res/values/attr.xml create mode 100644 java/com/android/dialer/theme/res/color/settings_text_color_primary.xml create mode 100644 java/com/android/dialer/theme/res/color/settings_text_color_secondary.xml create mode 100644 java/com/android/dialer/theme/res/values/colors_dialer_light.xml delete mode 100644 java/com/android/dialer/theme/res/values/styles.xml create mode 100644 java/com/android/dialer/theme/res/values/styles_dialer_light.xml create mode 100644 java/com/android/dialer/theme/res/values/theme_dialer_light.xml delete mode 100644 java/com/android/dialer/theme/res/values/themes.xml delete mode 100644 java/com/android/incallui/res/drawable/incall_background_gradient.xml delete mode 100644 java/com/android/incallui/res/values/colors.xml delete mode 100644 java/com/android/incallui/res/values/dimens.xml delete mode 100644 java/com/android/incallui/res/values/styles.xml create mode 100644 java/com/android/incallui/theme/AndroidManifest.xml create mode 100644 java/com/android/incallui/theme/res/drawable/incall_background_gradient.xml create mode 100644 java/com/android/incallui/theme/res/values/colors.xml create mode 100644 java/com/android/incallui/theme/res/values/dimens.xml create mode 100644 java/com/android/incallui/theme/res/values/strings.xml create mode 100644 java/com/android/incallui/theme/res/values/styles.xml (limited to 'java/com/android') diff --git a/java/com/android/contacts/common/list/ViewPagerTabStrip.java b/java/com/android/contacts/common/list/ViewPagerTabStrip.java index 969a6d342..8835631f5 100644 --- a/java/com/android/contacts/common/list/ViewPagerTabStrip.java +++ b/java/com/android/contacts/common/list/ViewPagerTabStrip.java @@ -24,6 +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; public class ViewPagerTabStrip extends LinearLayout { @@ -42,8 +43,8 @@ public class ViewPagerTabStrip extends LinearLayout { final Resources res = context.getResources(); mSelectedUnderlineThickness = res.getDimensionPixelSize(R.dimen.tab_selected_underline_height); - int underlineColor = res.getColor(R.color.tab_selected_underline_color); - int backgroundColor = res.getColor(R.color.contactscommon_actionbar_background_color); + int underlineColor = ThemeUtil.getColorAccent(); + int backgroundColor = ThemeUtil.getColorPrimary(); mSelectedUnderlinePaint = new Paint(); mSelectedUnderlinePaint.setColor(underlineColor); diff --git a/java/com/android/contacts/common/res/drawable/ic_scroll_handle_pressed.xml b/java/com/android/contacts/common/res/drawable/ic_scroll_handle_pressed.xml index 4838de58a..c9b93d925 100644 --- a/java/com/android/contacts/common/res/drawable/ic_scroll_handle_pressed.xml +++ b/java/com/android/contacts/common/res/drawable/ic_scroll_handle_pressed.xml @@ -17,4 +17,4 @@ \ No newline at end of file + android:tint="?android:attr/colorPrimary"/> \ No newline at end of file diff --git a/java/com/android/contacts/common/res/drawable/searchedittext_custom_cursor.xml b/java/com/android/contacts/common/res/drawable/searchedittext_custom_cursor.xml index 27614a1ac..51e984ca0 100644 --- a/java/com/android/contacts/common/res/drawable/searchedittext_custom_cursor.xml +++ b/java/com/android/contacts/common/res/drawable/searchedittext_custom_cursor.xml @@ -1,7 +1,21 @@ - + - + \ No newline at end of file diff --git a/java/com/android/contacts/common/res/values/colors.xml b/java/com/android/contacts/common/res/values/colors.xml index 3044339fd..b05c19a83 100644 --- a/java/com/android/contacts/common/res/values/colors.xml +++ b/java/com/android/contacts/common/res/values/colors.xml @@ -51,7 +51,7 @@ #424242 - @color/dialer_theme_color + ?android:attr/colorPrimary #ffffff @color/tab_ripple_color @@ -75,7 +75,7 @@ #737373 @color/searchbox_hint_text_color - @color/dialtacts_theme_color + ?android:attr/colorPrimary #f9f9f9 diff --git a/java/com/android/dialer/about/AndroidManifest.xml b/java/com/android/dialer/about/AndroidManifest.xml index 3d5067ade..6892674d1 100644 --- a/java/com/android/dialer/about/AndroidManifest.xml +++ b/java/com/android/dialer/about/AndroidManifest.xml @@ -14,7 +14,7 @@ --> - + - + - + android:theme="@style/DialtactsTheme"> diff --git a/java/com/android/dialer/app/calllog/BlockReportSpamListener.java b/java/com/android/dialer/app/calllog/BlockReportSpamListener.java index 987615f5f..865cb81cf 100644 --- a/java/com/android/dialer/app/calllog/BlockReportSpamListener.java +++ b/java/com/android/dialer/app/calllog/BlockReportSpamListener.java @@ -16,9 +16,9 @@ package com.android.dialer.app.calllog; -import android.app.FragmentManager; import android.content.Context; import android.support.annotation.NonNull; +import android.support.v4.app.FragmentManager; import android.support.v7.widget.RecyclerView; import android.view.View; import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler; diff --git a/java/com/android/dialer/app/calllog/CallLogAdapter.java b/java/com/android/dialer/app/calllog/CallLogAdapter.java index 450e5eaa7..143af367a 100644 --- a/java/com/android/dialer/app/calllog/CallLogAdapter.java +++ b/java/com/android/dialer/app/calllog/CallLogAdapter.java @@ -36,6 +36,7 @@ import android.support.annotation.Nullable; import android.support.annotation.VisibleForTesting; import android.support.annotation.WorkerThread; import android.support.v7.app.AlertDialog; +import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView.ViewHolder; import android.telecom.PhoneAccountHandle; @@ -223,7 +224,7 @@ public class CallLogAdapter extends GroupingListAdapter private void showDeleteSelectedItemsDialog() { SparseArray voicemailsToDeleteOnConfirmation = selectedItems.clone(); - new AlertDialog.Builder(activity, R.style.AlertDialogCustom) + new AlertDialog.Builder(activity) .setCancelable(true) .setTitle( activity @@ -557,7 +558,7 @@ public class CallLogAdapter extends GroupingListAdapter new BlockReportSpamListener( this.activity, this.activity.findViewById(R.id.call_log_fragment_root), - ((Activity) this.activity).getFragmentManager(), + ((AppCompatActivity) this.activity).getSupportFragmentManager(), this, this.filteredNumberAsyncQueryHandler); setHasStableIds(true); diff --git a/java/com/android/dialer/app/manifests/activities/AndroidManifest.xml b/java/com/android/dialer/app/manifests/activities/AndroidManifest.xml index 31960c979..edf0f1c8c 100644 --- a/java/com/android/dialer/app/manifests/activities/AndroidManifest.xml +++ b/java/com/android/dialer/app/manifests/activities/AndroidManifest.xml @@ -19,7 +19,7 @@ - + - + diff --git a/java/com/android/dialer/app/res/color/settings_text_color_primary.xml b/java/com/android/dialer/app/res/color/settings_text_color_primary.xml deleted file mode 100644 index ba259088a..000000000 --- a/java/com/android/dialer/app/res/color/settings_text_color_primary.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/java/com/android/dialer/app/res/color/settings_text_color_secondary.xml b/java/com/android/dialer/app/res/color/settings_text_color_secondary.xml deleted file mode 100644 index 2f7899272..000000000 --- a/java/com/android/dialer/app/res/color/settings_text_color_secondary.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/java/com/android/dialer/app/res/drawable/ic_voicemail_seek_handle.xml b/java/com/android/dialer/app/res/drawable/ic_voicemail_seek_handle.xml index ffdd64edc..00b23b84d 100644 --- a/java/com/android/dialer/app/res/drawable/ic_voicemail_seek_handle.xml +++ b/java/com/android/dialer/app/res/drawable/ic_voicemail_seek_handle.xml @@ -16,5 +16,5 @@ --> + android:tint="?android:attr/colorPrimary"> \ No newline at end of file diff --git a/java/com/android/dialer/app/res/drawable/selectable_primary_flat_button.xml b/java/com/android/dialer/app/res/drawable/selectable_primary_flat_button.xml index 47d1152db..2a393a570 100644 --- a/java/com/android/dialer/app/res/drawable/selectable_primary_flat_button.xml +++ b/java/com/android/dialer/app/res/drawable/selectable_primary_flat_button.xml @@ -25,7 +25,7 @@ - + \ No newline at end of file diff --git a/java/com/android/dialer/app/res/layout/call_log_activity.xml b/java/com/android/dialer/app/res/layout/call_log_activity.xml index a5e532698..d9d40a1a0 100644 --- a/java/com/android/dialer/app/res/layout/call_log_activity.xml +++ b/java/com/android/dialer/app/res/layout/call_log_activity.xml @@ -18,7 +18,7 @@ android:id="@+id/calllog_frame" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/background_dialer_light" + android:background="?android:attr/colorBackgroundFloating" android:orientation="vertical"> diff --git a/java/com/android/dialer/app/res/layout/call_log_list_item.xml b/java/com/android/dialer/app/res/layout/call_log_list_item.xml index d1111103e..23aeda3da 100644 --- a/java/com/android/dialer/app/res/layout/call_log_list_item.xml +++ b/java/com/android/dialer/app/res/layout/call_log_list_item.xml @@ -143,7 +143,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/call_log_call_account_margin_bottom" android:layout_marginEnd="@dimen/call_log_icon_margin" - android:textColor="?android:textColorSecondary" + android:textColor="?android:attr/textColorSecondary" android:textSize="@dimen/call_log_detail_text_size" android:visibility="gone" android:maxLines="1"/> diff --git a/java/com/android/dialer/app/res/layout/dialtacts_activity.xml b/java/com/android/dialer/app/res/layout/dialtacts_activity.xml index 1627844d6..cf6591b63 100644 --- a/java/com/android/dialer/app/res/layout/dialtacts_activity.xml +++ b/java/com/android/dialer/app/res/layout/dialtacts_activity.xml @@ -19,7 +19,7 @@ android:id="@+id/dialtacts_mainlayout" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/background_dialer_light" + android:background="?android:attr/colorBackgroundFloating" android:clipChildren="false" android:clipToPadding="false" android:focusable="true" diff --git a/java/com/android/dialer/app/res/layout/keyguard_preview.xml b/java/com/android/dialer/app/res/layout/keyguard_preview.xml index eab98d261..e5207ac8b 100644 --- a/java/com/android/dialer/app/res/layout/keyguard_preview.xml +++ b/java/com/android/dialer/app/res/layout/keyguard_preview.xml @@ -23,7 +23,7 @@ + android:background="?android:attr/colorPrimaryDark"/> diff --git a/java/com/android/dialer/app/res/layout/search_edittext.xml b/java/com/android/dialer/app/res/layout/search_edittext.xml index 5fc492d29..8a2cfd483 100644 --- a/java/com/android/dialer/app/res/layout/search_edittext.xml +++ b/java/com/android/dialer/app/res/layout/search_edittext.xml @@ -31,7 +31,7 @@ android:id="@+id/search_box_collapsed" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?android:selectableItemBackground" + android:background="?android:attr/selectableItemBackground" android:gravity="center_vertical"> - diff --git a/java/com/android/dialer/app/res/values/colors.xml b/java/com/android/dialer/app/res/values/colors.xml index e79c5c5ed..2b8d63ac0 100644 --- a/java/com/android/dialer/app/res/values/colors.xml +++ b/java/com/android/dialer/app/res/values/colors.xml @@ -15,13 +15,8 @@ --> - @color/dialer_theme_color + ?android:attr/colorPrimary - - @color/dialer_primary_text_color - - @color/dialer_secondary_text_color - #aaaaaa #ffffff @@ -50,7 +45,7 @@ #cecece - @color/dialer_theme_color + ?android:attr/colorPrimary #f9f9f9 @@ -76,7 +71,7 @@ #616161 #FFFFFF #F44336 - @color/dialer_theme_color + ?android:attr/colorPrimary #E0E0E0 #bdbdbd diff --git a/java/com/android/dialer/app/res/values/styles.xml b/java/com/android/dialer/app/res/values/styles.xml index 869f1276d..54d18f103 100644 --- a/java/com/android/dialer/app/res/values/styles.xml +++ b/java/com/android/dialer/app/res/values/styles.xml @@ -15,134 +15,18 @@ ~ limitations under the License --> - - - - - - - - - + - - - - - - - - - - - - - diff --git a/java/com/android/dialer/binary/common/DialerApplication.java b/java/com/android/dialer/binary/common/DialerApplication.java index 3247c7053..31d4d828e 100644 --- a/java/com/android/dialer/binary/common/DialerApplication.java +++ b/java/com/android/dialer/binary/common/DialerApplication.java @@ -42,7 +42,6 @@ public abstract class DialerApplication extends Application implements HasRootCo public void onCreate() { Trace.beginSection("DialerApplication.onCreate"); StrictModeComponent.get(this).getDialerStrictMode().onApplicationCreate(this); - super.onCreate(); new BlockedNumbersAutoMigrator( this.getApplicationContext(), diff --git a/java/com/android/dialer/blocking/AndroidManifest.xml b/java/com/android/dialer/blocking/AndroidManifest.xml index 08d243988..fb811ea03 100644 --- a/java/com/android/dialer/blocking/AndroidManifest.xml +++ b/java/com/android/dialer/blocking/AndroidManifest.xml @@ -1,9 +1,23 @@ + - + - fragment.dismiss()); } diff --git a/java/com/android/dialer/blockreportspam/ShowBlockReportSpamDialogReceiver.java b/java/com/android/dialer/blockreportspam/ShowBlockReportSpamDialogReceiver.java index fd26ab537..fb0399d9a 100644 --- a/java/com/android/dialer/blockreportspam/ShowBlockReportSpamDialogReceiver.java +++ b/java/com/android/dialer/blockreportspam/ShowBlockReportSpamDialogReceiver.java @@ -16,11 +16,11 @@ package com.android.dialer.blockreportspam; -import android.app.FragmentManager; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; +import android.support.v4.app.FragmentManager; import android.widget.Toast; import com.android.dialer.blocking.Blocking; import com.android.dialer.blocking.Blocking.BlockingFailedException; diff --git a/java/com/android/dialer/callcomposer/AndroidManifest.xml b/java/com/android/dialer/callcomposer/AndroidManifest.xml index cce71105f..369db6f4a 100644 --- a/java/com/android/dialer/callcomposer/AndroidManifest.xml +++ b/java/com/android/dialer/callcomposer/AndroidManifest.xml @@ -17,7 +17,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.dialer.callcomposer"> - + diff --git a/java/com/android/dialer/callcomposer/res/drawable/call_composer_contact_border.xml b/java/com/android/dialer/callcomposer/res/drawable/call_composer_contact_border.xml index b3c36e9e0..16afed495 100644 --- a/java/com/android/dialer/callcomposer/res/drawable/call_composer_contact_border.xml +++ b/java/com/android/dialer/callcomposer/res/drawable/call_composer_contact_border.xml @@ -20,7 +20,7 @@ + android:color="?android:attr/colorBackground"/> - + diff --git a/java/com/android/dialer/callcomposer/res/drawable/gallery_item_selected_drawable.xml b/java/com/android/dialer/callcomposer/res/drawable/gallery_item_selected_drawable.xml index 5050407c5..6e726c889 100644 --- a/java/com/android/dialer/callcomposer/res/drawable/gallery_item_selected_drawable.xml +++ b/java/com/android/dialer/callcomposer/res/drawable/gallery_item_selected_drawable.xml @@ -20,9 +20,9 @@ android:shape="oval"> + android:color="?android:attr/colorPrimary"/> + android:color="?android:attr/colorBackground"/> @@ -32,6 +32,6 @@ + android:tint="?android:attr/colorPrimary"/> \ No newline at end of file diff --git a/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml b/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml index 48d6368c2..4d3769b6d 100644 --- a/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml +++ b/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml @@ -45,7 +45,7 @@ android:paddingBottom="@dimen/call_composer_contact_container_padding_bottom" android:paddingStart="16dp" android:paddingEnd="16dp" - android:background="@color/dialer_theme_color"> + android:background="?android:attr/colorPrimary"> @@ -105,7 +105,7 @@ android:layout_height="@dimen/call_composer_media_bar_height" android:orientation="horizontal" android:gravity="center_horizontal" - android:background="@color/dialer_theme_color_dark" + android:background="?android:attr/colorPrimaryDark" android:clickable="true"> + android:textColor="?android:attr/colorBackground"/> diff --git a/java/com/android/dialer/callcomposer/res/layout/fragment_gallery_composer.xml b/java/com/android/dialer/callcomposer/res/layout/fragment_gallery_composer.xml index 6cd6418a4..72b9fa685 100644 --- a/java/com/android/dialer/callcomposer/res/layout/fragment_gallery_composer.xml +++ b/java/com/android/dialer/callcomposer/res/layout/fragment_gallery_composer.xml @@ -18,7 +18,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/background_dialer_white" + android:background="?android:attr/colorBackground" android:paddingBottom="@dimen/call_composer_media_bar_height"> + android:background="?android:attr/colorBackground"> + android:textColor="?android:attr/textColorHint"/> \ No newline at end of file diff --git a/java/com/android/dialer/callcomposer/res/layout/permission_view.xml b/java/com/android/dialer/callcomposer/res/layout/permission_view.xml index 4daa11d62..783ba9867 100644 --- a/java/com/android/dialer/callcomposer/res/layout/permission_view.xml +++ b/java/com/android/dialer/callcomposer/res/layout/permission_view.xml @@ -20,7 +20,7 @@ android:layout_height="match_parent" android:gravity="center" android:clickable="true" - android:background="@color/background_dialer_white"> + android:background="?android:attr/colorBackground"> diff --git a/java/com/android/dialer/callcomposer/res/values/styles.xml b/java/com/android/dialer/callcomposer/res/values/styles.xml index a03ee4894..aeec2a369 100644 --- a/java/com/android/dialer/callcomposer/res/values/styles.xml +++ b/java/com/android/dialer/callcomposer/res/values/styles.xml @@ -15,8 +15,7 @@ ~ limitations under the License --> - - - - - - - - diff --git a/java/com/android/dialer/dialpadview/theme/AndroidManifest.xml b/java/com/android/dialer/dialpadview/theme/AndroidManifest.xml new file mode 100644 index 000000000..f0726d0a7 --- /dev/null +++ b/java/com/android/dialer/dialpadview/theme/AndroidManifest.xml @@ -0,0 +1,16 @@ + + diff --git a/java/com/android/dialer/dialpadview/theme/res/values/attr.xml b/java/com/android/dialer/dialpadview/theme/res/values/attr.xml new file mode 100644 index 000000000..99707aa1d --- /dev/null +++ b/java/com/android/dialer/dialpadview/theme/res/values/attr.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/com/android/dialer/dialpadview/theme/res/values/dimens.xml b/java/com/android/dialer/dialpadview/theme/res/values/dimens.xml new file mode 100644 index 000000000..e90ee1c92 --- /dev/null +++ b/java/com/android/dialer/dialpadview/theme/res/values/dimens.xml @@ -0,0 +1,27 @@ + + + + + 36dp + 12sp + 10sp + 3dp + 34sp + 60dp + + 80dp + \ No newline at end of file diff --git a/java/com/android/dialer/dialpadview/theme/res/values/styles.xml b/java/com/android/dialer/dialpadview/theme/res/values/styles.xml new file mode 100644 index 000000000..408a33dd1 --- /dev/null +++ b/java/com/android/dialer/dialpadview/theme/res/values/styles.xml @@ -0,0 +1,51 @@ + + + + + + + + + \ No newline at end of file diff --git a/java/com/android/dialer/enrichedcall/simulator/AndroidManifest.xml b/java/com/android/dialer/enrichedcall/simulator/AndroidManifest.xml index 003ff19d5..e5e5a42e9 100644 --- a/java/com/android/dialer/enrichedcall/simulator/AndroidManifest.xml +++ b/java/com/android/dialer/enrichedcall/simulator/AndroidManifest.xml @@ -16,11 +16,11 @@ - - + + android:theme="@style/Dialer.ThemeBase.NoActionBar"> diff --git a/java/com/android/dialer/historyitemactions/res/layout/contact_layout.xml b/java/com/android/dialer/historyitemactions/res/layout/contact_layout.xml index 89cb91435..5fe40939e 100644 --- a/java/com/android/dialer/historyitemactions/res/layout/contact_layout.xml +++ b/java/com/android/dialer/historyitemactions/res/layout/contact_layout.xml @@ -40,13 +40,13 @@ diff --git a/java/com/android/dialer/historyitemactions/res/layout/module_layout.xml b/java/com/android/dialer/historyitemactions/res/layout/module_layout.xml index 063051947..6b54e5e8b 100644 --- a/java/com/android/dialer/historyitemactions/res/layout/module_layout.xml +++ b/java/com/android/dialer/historyitemactions/res/layout/module_layout.xml @@ -35,5 +35,5 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - style="@style/PrimaryText"/> + style="@style/Dialer.TextAppearance.Primary"/> \ No newline at end of file diff --git a/java/com/android/dialer/historyitemactions/res/values/styles.xml b/java/com/android/dialer/historyitemactions/res/values/styles.xml index ed3cf115a..98e2ec999 100644 --- a/java/com/android/dialer/historyitemactions/res/values/styles.xml +++ b/java/com/android/dialer/historyitemactions/res/values/styles.xml @@ -19,7 +19,7 @@ false false false - @color/background_dialer_white + ?android:attr/colorBackground \ No newline at end of file diff --git a/java/com/android/dialer/main/impl/res/values/strings.xml b/java/com/android/dialer/main/impl/res/values/strings.xml index 121820383..cde78e66d 100644 --- a/java/com/android/dialer/main/impl/res/values/strings.xml +++ b/java/com/android/dialer/main/impl/res/values/strings.xml @@ -21,9 +21,6 @@ Phone Keypad - - Call history - @android:string/search_go diff --git a/java/com/android/dialer/main/impl/res/values/styles.xml b/java/com/android/dialer/main/impl/res/values/styles.xml index 387b1d79e..467cb5be0 100644 --- a/java/com/android/dialer/main/impl/res/values/styles.xml +++ b/java/com/android/dialer/main/impl/res/values/styles.xml @@ -17,47 +17,24 @@ - - diff --git a/java/com/android/dialer/main/impl/toolbar/res/drawable/custom_cursor.xml b/java/com/android/dialer/main/impl/toolbar/res/drawable/custom_cursor.xml index 008b0a3cc..f352901de 100644 --- a/java/com/android/dialer/main/impl/toolbar/res/drawable/custom_cursor.xml +++ b/java/com/android/dialer/main/impl/toolbar/res/drawable/custom_cursor.xml @@ -16,5 +16,5 @@ --> - + \ No newline at end of file diff --git a/java/com/android/dialer/main/impl/toolbar/res/drawable/search_bar_background.xml b/java/com/android/dialer/main/impl/toolbar/res/drawable/search_bar_background.xml index 8767057a5..8bc21c4a8 100644 --- a/java/com/android/dialer/main/impl/toolbar/res/drawable/search_bar_background.xml +++ b/java/com/android/dialer/main/impl/toolbar/res/drawable/search_bar_background.xml @@ -16,5 +16,5 @@ --> - + diff --git a/java/com/android/dialer/main/impl/toolbar/res/drawable/search_bar_background_rounded_corners.xml b/java/com/android/dialer/main/impl/toolbar/res/drawable/search_bar_background_rounded_corners.xml index 58cdabe8b..2bbc8d106 100644 --- a/java/com/android/dialer/main/impl/toolbar/res/drawable/search_bar_background_rounded_corners.xml +++ b/java/com/android/dialer/main/impl/toolbar/res/drawable/search_bar_background_rounded_corners.xml @@ -16,6 +16,6 @@ --> - + diff --git a/java/com/android/dialer/main/impl/toolbar/res/layout/expanded_search_bar.xml b/java/com/android/dialer/main/impl/toolbar/res/layout/expanded_search_bar.xml index 3bd71b63a..8a8730f78 100644 --- a/java/com/android/dialer/main/impl/toolbar/res/layout/expanded_search_bar.xml +++ b/java/com/android/dialer/main/impl/toolbar/res/layout/expanded_search_bar.xml @@ -29,7 +29,7 @@ android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/action_menu_back_from_search" android:src="@drawable/quantum_ic_arrow_back_vd_theme_24" - android:tint="@color/dialer_theme_color"/> + android:tint="?android:attr/colorPrimary"/> diff --git a/java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml b/java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml index d63fdfe2f..98b856361 100644 --- a/java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml +++ b/java/com/android/dialer/main/impl/toolbar/res/layout/toolbar_layout.xml @@ -18,7 +18,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="@dimen/expanded_search_bar_height" - android:background="@color/dialer_theme_color" + android:background="?android:attr/colorPrimary" app:contentInsetEnd="0dp" app:contentInsetStart="0dp"> @@ -122,14 +122,14 @@ android:layout_marginTop="8dp" android:layout_marginBottom="8dp" android:src="@drawable/quantum_ic_close_vd_theme_24" - android:tint="@color/dialer_primary_text_color_white"/> + android:tint="?android:attr/textColorPrimaryInverse"/> diff --git a/java/com/android/dialer/postcall/AndroidManifest.xml b/java/com/android/dialer/postcall/AndroidManifest.xml index a09750564..82101a0b3 100644 --- a/java/com/android/dialer/postcall/AndroidManifest.xml +++ b/java/com/android/dialer/postcall/AndroidManifest.xml @@ -17,11 +17,11 @@ xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.dialer.postcall"> - - + diff --git a/java/com/android/dialer/postcall/res/layout/post_call_activity.xml b/java/com/android/dialer/postcall/res/layout/post_call_activity.xml index c42764e5b..94df3242c 100644 --- a/java/com/android/dialer/postcall/res/layout/post_call_activity.xml +++ b/java/com/android/dialer/postcall/res/layout/post_call_activity.xml @@ -19,7 +19,7 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/background_dialer_white"> + android:background="?android:attr/colorBackground"> + android:background="?android:attr/colorBackground"/> \ No newline at end of file diff --git a/java/com/android/dialer/precall/impl/res/values/styles.xml b/java/com/android/dialer/precall/impl/res/values/styles.xml deleted file mode 100644 index dd41265a4..000000000 --- a/java/com/android/dialer/precall/impl/res/values/styles.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - diff --git a/java/com/android/dialer/rtt/AndroidManifest.xml b/java/com/android/dialer/rtt/AndroidManifest.xml index c92fb1ceb..ecc4fe1bc 100644 --- a/java/com/android/dialer/rtt/AndroidManifest.xml +++ b/java/com/android/dialer/rtt/AndroidManifest.xml @@ -16,6 +16,7 @@ - + + \ No newline at end of file diff --git a/java/com/android/dialer/searchfragment/common/res/layout/search_contact_row.xml b/java/com/android/dialer/searchfragment/common/res/layout/search_contact_row.xml index a0d9dd274..fb6f66c39 100644 --- a/java/com/android/dialer/searchfragment/common/res/layout/search_contact_row.xml +++ b/java/com/android/dialer/searchfragment/common/res/layout/search_contact_row.xml @@ -45,7 +45,7 @@ android:layout_height="wrap_content" android:gravity="center_vertical|start" android:fontFamily="sans-serif" - style="@style/PrimaryText"/> + style="@style/Dialer.TextAppearance.Primary"/> + style="@style/Dialer.TextAppearance.Secondary"/> + android:background="?android:attr/colorBackgroundFloating"/> + android:background="?android:attr/colorBackgroundFloating"/> diff --git a/java/com/android/dialer/searchfragment/list/res/layout/header_layout.xml b/java/com/android/dialer/searchfragment/list/res/layout/header_layout.xml index 6eb1d2e40..b22ddd9a0 100644 --- a/java/com/android/dialer/searchfragment/list/res/layout/header_layout.xml +++ b/java/com/android/dialer/searchfragment/list/res/layout/header_layout.xml @@ -27,5 +27,5 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - style="@style/SecondaryText"/> + style="@style/Dialer.TextAppearance.Secondary"/> diff --git a/java/com/android/dialer/searchfragment/list/res/layout/search_action_layout.xml b/java/com/android/dialer/searchfragment/list/res/layout/search_action_layout.xml index 8b366fe8a..b6e304807 100644 --- a/java/com/android/dialer/searchfragment/list/res/layout/search_action_layout.xml +++ b/java/com/android/dialer/searchfragment/list/res/layout/search_action_layout.xml @@ -26,7 +26,7 @@ android:layout_marginStart="8dp" android:layout_gravity="center_vertical|start" android:padding="12dp" - android:tint="@color/dialer_theme_color"/> + android:tint="?android:attr/colorPrimary"/> + style="@style/Dialer.TextAppearance.Primary"/> \ No newline at end of file diff --git a/java/com/android/dialer/searchfragment/nearbyplaces/res/layout/location_permission_row.xml b/java/com/android/dialer/searchfragment/nearbyplaces/res/layout/location_permission_row.xml index 4373252bd..a79e5883c 100644 --- a/java/com/android/dialer/searchfragment/nearbyplaces/res/layout/location_permission_row.xml +++ b/java/com/android/dialer/searchfragment/nearbyplaces/res/layout/location_permission_row.xml @@ -72,7 +72,7 @@ android:paddingTop="8dp" android:paddingBottom="8dp" android:text="@string/nearby_places_dismiss" - android:textColor="@color/dialer_theme_color" + android:textColor="?android:attr/colorPrimary" style="@style/Widget.AppCompat.Button.Borderless"/> \ No newline at end of file diff --git a/java/com/android/dialer/shortcuts/AndroidManifest.xml b/java/com/android/dialer/shortcuts/AndroidManifest.xml index f0d19af7c..c0f07bf01 100644 --- a/java/com/android/dialer/shortcuts/AndroidManifest.xml +++ b/java/com/android/dialer/shortcuts/AndroidManifest.xml @@ -20,9 +20,9 @@ android:minSdkVersion="24" android:targetSdkVersion="28"/> - + - diff --git a/java/com/android/dialer/spam/promo/SpamBlockingPromoDialogFragment.java b/java/com/android/dialer/spam/promo/SpamBlockingPromoDialogFragment.java index ea54728a6..dbefc52c9 100644 --- a/java/com/android/dialer/spam/promo/SpamBlockingPromoDialogFragment.java +++ b/java/com/android/dialer/spam/promo/SpamBlockingPromoDialogFragment.java @@ -16,12 +16,12 @@ package com.android.dialer.spam.promo; -import android.app.AlertDialog; import android.app.Dialog; -import android.app.DialogFragment; import android.content.DialogInterface; import android.os.Bundle; import android.support.annotation.Nullable; +import android.support.v4.app.DialogFragment; +import android.support.v7.app.AlertDialog; /** Dialog for spam blocking on-boarding promotion. */ public class SpamBlockingPromoDialogFragment extends DialogFragment { @@ -64,7 +64,7 @@ public class SpamBlockingPromoDialogFragment extends DialogFragment { public Dialog onCreateDialog(Bundle savedInstanceState) { super.onCreateDialog(savedInstanceState); // Return the newly created dialog - return new AlertDialog.Builder(getActivity(), R.style.AlertDialogTheme) + return new AlertDialog.Builder(getActivity()) .setCancelable(true) .setTitle(R.string.spam_blocking_promo_title) .setMessage(R.string.spam_blocking_promo_text) diff --git a/java/com/android/dialer/spam/promo/SpamBlockingPromoHelper.java b/java/com/android/dialer/spam/promo/SpamBlockingPromoHelper.java index c7bf53696..a24c238b4 100644 --- a/java/com/android/dialer/spam/promo/SpamBlockingPromoHelper.java +++ b/java/com/android/dialer/spam/promo/SpamBlockingPromoHelper.java @@ -17,7 +17,6 @@ package com.android.dialer.spam.promo; import android.annotation.SuppressLint; -import android.app.FragmentManager; import android.app.Notification; import android.app.Notification.Builder; import android.app.PendingIntent; @@ -25,6 +24,7 @@ import android.content.Context; import android.content.DialogInterface.OnDismissListener; import android.graphics.drawable.Icon; import android.support.design.widget.Snackbar; +import android.support.v4.app.FragmentManager; import android.support.v4.os.BuildCompat; import android.view.View; import android.widget.Toast; diff --git a/java/com/android/dialer/speeddial/res/drawable/context_menu_background.xml b/java/com/android/dialer/speeddial/res/drawable/context_menu_background.xml index c828860b2..2b36457fc 100644 --- a/java/com/android/dialer/speeddial/res/drawable/context_menu_background.xml +++ b/java/com/android/dialer/speeddial/res/drawable/context_menu_background.xml @@ -21,6 +21,6 @@ android:topRightRadius="@dimen/speed_dial_context_menu_corner_radius" android:bottomLeftRadius="@dimen/speed_dial_context_menu_corner_radius" android:topLeftRadius="@dimen/speed_dial_context_menu_corner_radius"/> - + \ No newline at end of file diff --git a/java/com/android/dialer/speeddial/res/drawable/favorite_icon.xml b/java/com/android/dialer/speeddial/res/drawable/favorite_icon.xml index 81b018ff1..565877d30 100644 --- a/java/com/android/dialer/speeddial/res/drawable/favorite_icon.xml +++ b/java/com/android/dialer/speeddial/res/drawable/favorite_icon.xml @@ -18,6 +18,6 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval"> - - + + \ No newline at end of file diff --git a/java/com/android/dialer/speeddial/res/layout/disambig_dialog_layout.xml b/java/com/android/dialer/speeddial/res/layout/disambig_dialog_layout.xml index aec081385..e395d4bd6 100644 --- a/java/com/android/dialer/speeddial/res/layout/disambig_dialog_layout.xml +++ b/java/com/android/dialer/speeddial/res/layout/disambig_dialog_layout.xml @@ -31,10 +31,8 @@ android:paddingEnd="24dp" android:elevation="1dp" android:text="@string/speed_dial_disambig_dialog_title" - android:textSize="20sp" - android:textColor="@color/dialer_primary_text_color" - android:fontFamily="sans-serif-medium" - android:background="@android:color/white"/> + android:background="?android:attr/colorBackgroundFloating" + style="@style/Dialer.TextAppearance.Header"/> + android:background="?android:attr/colorBackgroundFloating"> + style="@style/Dialer.TextAppearance.Secondary"/> diff --git a/java/com/android/dialer/speeddial/res/layout/disambig_option_layout.xml b/java/com/android/dialer/speeddial/res/layout/disambig_option_layout.xml index a1a5b2941..038800548 100644 --- a/java/com/android/dialer/speeddial/res/layout/disambig_option_layout.xml +++ b/java/com/android/dialer/speeddial/res/layout/disambig_option_layout.xml @@ -29,7 +29,7 @@ android:layout_width="24dp" android:layout_height="24dp" android:layout_gravity="center_vertical" - android:tint="@color/dialer_secondary_text_color"/> + android:tint="?colorIcon"/> + style="@style/Dialer.TextAppearance.Primary"/> \ No newline at end of file diff --git a/java/com/android/dialer/speeddial/res/layout/favorite_item_layout.xml b/java/com/android/dialer/speeddial/res/layout/favorite_item_layout.xml index a0bbfbd36..a8bc55bb7 100644 --- a/java/com/android/dialer/speeddial/res/layout/favorite_item_layout.xml +++ b/java/com/android/dialer/speeddial/res/layout/favorite_item_layout.xml @@ -68,7 +68,7 @@ android:layout_marginBottom="1dp" android:fontFamily="sans-serif-medium" android:textSize="14sp" - style="@style/PrimaryText"/> + style="@style/Dialer.TextAppearance.Primary"/> + style="@style/Dialer.TextAppearance.Secondary"/> \ No newline at end of file diff --git a/java/com/android/dialer/speeddial/res/layout/fragment_speed_dial.xml b/java/com/android/dialer/speeddial/res/layout/fragment_speed_dial.xml index 1e35091c9..57f8885ff 100644 --- a/java/com/android/dialer/speeddial/res/layout/fragment_speed_dial.xml +++ b/java/com/android/dialer/speeddial/res/layout/fragment_speed_dial.xml @@ -24,7 +24,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:clipToPadding="false" - android:background="@color/background_dialer_light" + android:background="?android:attr/colorBackgroundFloating" android:paddingBottom="@dimen/floating_action_button_list_bottom_padding"/> + style="@style/Dialer.TextAppearance.Secondary"/>