diff options
Diffstat (limited to 'java/com/android/dialer/app')
19 files changed, 52 insertions, 210 deletions
diff --git a/java/com/android/dialer/app/AndroidManifest.xml b/java/com/android/dialer/app/AndroidManifest.xml index 3536ecdc5..190f098a5 100644 --- a/java/com/android/dialer/app/AndroidManifest.xml +++ b/java/com/android/dialer/app/AndroidManifest.xml @@ -58,9 +58,9 @@ android:minSdkVersion="24" android:targetSdkVersion="28"/> - <application android:theme="@style/Theme.AppCompat"> + <application> - <activity + <activity android:exported="false" android:label="@string/manage_blocked_numbers_label" android:name="com.android.dialer.app.filterednumber.BlockedNumbersSettingsActivity" @@ -75,7 +75,7 @@ <activity android:label="@string/call_log_activity_title" android:name="com.android.dialer.app.calllog.CallLogActivity" - android:theme="@style/DialtactsThemeWithoutActionBarOverlay"> + android:theme="@style/DialtactsTheme"> </activity> <receiver android:name="com.android.dialer.app.calllog.CallLogReceiver"> 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<String> 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 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.dialer.app"> - <application android:theme="@style/Theme.AppCompat"> + <application> <activity android:exported="false" @@ -101,7 +101,7 @@ <category android:name="android.intent.category.DEFAULT"/> <category android:name="android.intent.category.TAB"/> </intent-filter> - <intent-filter android:label="@string/main_call_history_tab_description"> + <intent-filter> <action android:name="com.android.phone.action.RECENT_CALLS"/> <category android:name="android.intent.category.DEFAULT"/> 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 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* - * Copyright (C) 2015 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ ---> - -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:color="@color/setting_disabled_color" android:state_enabled="false"/> - <item android:color="@color/setting_primary_color"/> -</selector> 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 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* - * Copyright (C) 2015 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ ---> - -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:color="@color/setting_disabled_color" android:state_enabled="false"/> - <item android:color="@color/setting_secondary_color"/> -</selector> 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 @@ --> <bitmap xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/old_ic_handle" - android:tint="@color/actionbar_background_color"> + android:tint="?android:attr/colorPrimary"> </bitmap>
\ 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 @@ </item> <item> <shape> - <solid android:color="@color/dialer_theme_color"/> + <solid android:color="?android:attr/colorPrimary"/> </shape> </item> </selector>
\ 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"> <com.android.contacts.common.list.ViewPagerTabs android:id="@+id/viewpager_header" diff --git a/java/com/android/dialer/app/res/layout/call_log_fragment.xml b/java/com/android/dialer/app/res/layout/call_log_fragment.xml index f0563967c..2fb63606a 100644 --- a/java/com/android/dialer/app/res/layout/call_log_fragment.xml +++ b/java/com/android/dialer/app/res/layout/call_log_fragment.xml @@ -26,7 +26,7 @@ android:layout_width="match_parent" android:layout_height="@dimen/tab_height" android:layout_gravity="start" - android:background="@color/actionbar_background_color" + android:background="?android:attr/colorPrimary" android:orientation="horizontal" android:visibility="gone"> 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 @@ <View android:layout_width="match_parent" android:layout_height="25dp" - android:background="@color/dialer_theme_color_dark"/> + android:background="?android:attr/colorPrimaryDark"/> <View android:layout_width="match_parent" android:layout_height="0dp" diff --git a/java/com/android/dialer/app/res/layout/lists_fragment.xml b/java/com/android/dialer/app/res/layout/lists_fragment.xml index 95961729d..1126b0e51 100644 --- a/java/com/android/dialer/app/res/layout/lists_fragment.xml +++ b/java/com/android/dialer/app/res/layout/lists_fragment.xml @@ -32,7 +32,7 @@ <FrameLayout android:layout_width="match_parent" android:layout_height="@dimen/action_bar_height_large" - android:background="@color/actionbar_background_color" + android:background="?android:attr/colorPrimary" android:elevation="@dimen/tab_elevation"/> <com.android.contacts.common.list.ViewPagerTabs @@ -69,7 +69,7 @@ android:id="@+id/remove_view_content" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/actionbar_background_color" + android:background="?android:attr/colorPrimary" android:gravity="center" android:orientation="horizontal" android:visibility="gone"> 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"> <ImageView diff --git a/java/com/android/dialer/app/res/layout/voicemail_playback_layout.xml b/java/com/android/dialer/app/res/layout/voicemail_playback_layout.xml index 2589a67c6..a9b866e89 100644 --- a/java/com/android/dialer/app/res/layout/voicemail_playback_layout.xml +++ b/java/com/android/dialer/app/res/layout/voicemail_playback_layout.xml @@ -20,7 +20,7 @@ android:layout_height="wrap_content" android:layout_marginStart="64dp" android:layout_marginEnd="24dp" - android:background="@color/background_dialer_call_log_list_item" + android:background="?android:attr/colorBackgroundFloating" android:orientation="vertical"> <TextView diff --git a/java/com/android/dialer/app/res/values-v27/styles.xml b/java/com/android/dialer/app/res/values-v27/styles.xml index 5a946b6a0..76ae4ba62 100644 --- a/java/com/android/dialer/app/res/values-v27/styles.xml +++ b/java/com/android/dialer/app/res/values-v27/styles.xml @@ -15,9 +15,9 @@ ~ limitations under the License --> <resources> - <style name="DialtactsTheme" parent="DialtactsThemeBase"> + <style name="DialtactsTheme" parent="Dialer.ThemeBase"> <item name="android:windowLightNavigationBar">true</item> - <item name="android:navigationBarColor">?android:windowBackground</item> + <item name="android:navigationBarColor">?android:attr/windowBackground</item> <item name="android:navigationBarDividerColor">#E0E0E0</item> </style> </resources> 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 @@ --> <resources> - <color name="dialer_flat_button_text_color">@color/dialer_theme_color</color> + <color name="dialer_flat_button_text_color">?android:attr/colorPrimary</color> - <!-- Color for the setting text. --> - <color name="setting_primary_color">@color/dialer_primary_text_color</color> - <!-- Color for the setting description text. --> - <color name="setting_secondary_color">@color/dialer_secondary_text_color</color> - <color name="setting_disabled_color">#aaaaaa</color> <color name="setting_background_color">#ffffff</color> <!-- 54% black --> @@ -50,7 +45,7 @@ <!-- 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">@color/dialer_theme_color</color> + <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> @@ -76,7 +71,7 @@ <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">@color/dialer_theme_color</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> 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 --> <resources> - - <style name="AlertDialogCustom" parent="Theme.AppCompat.Light.Dialog.Alert"> - <item name="android:colorPrimary">@color/dialtacts_theme_color</item> - <item name="android:colorAccent">@color/dialtacts_theme_color</item> - </style> - - <style name="DialtactsThemeBase" parent="DialerThemeBase"> - - <!-- Styles that require AppCompat compatibility, remember to update both sets --> - <item name="android:windowActionBarOverlay">true</item> - <item name="windowActionBarOverlay">true</item> - <item name="android:windowActionModeOverlay">true</item> - <item name="windowActionModeOverlay">true</item> - <item name="android:actionBarStyle">@style/DialtactsActionBarStyle</item> - <item name="actionBarStyle">@style/DialtactsActionBarStyle</item> - <item name="actionModeStyle">@style/ActionModeStyle</item> - <item name="android:actionModeStyle">@style/ActionModeStyle</item> - - <item name="android:windowContentOverlay">@null</item> - <item name="android:overlapAnchor">true</item> - - <item name="android:listViewStyle">@style/ListViewStyle</item> - <item name="list_section_header_height">32dip</item> - <item name="list_item_padding_top">7dp</item> - <item name="list_item_padding_right">24dp</item> - <item name="list_item_padding_bottom">7dp</item> - <item name="list_item_padding_left">16dp</item> - <item name="list_item_gap_between_image_and_text"> - @dimen/contact_browser_list_item_gap_between_image_and_text - </item> - <item name="list_item_gap_between_label_and_data">8dip</item> - <item name="list_item_presence_icon_margin">4dip</item> - <item name="list_item_presence_icon_size">16dip</item> - <item name="list_item_photo_size">@dimen/contact_browser_list_item_photo_size</item> - <item name="list_item_profile_photo_size">70dip</item> - <item name="list_item_prefix_highlight_color">@color/people_app_theme_color</item> - <item name="list_item_background_color">@color/background_dialer_light</item> - <item name="list_item_header_text_indent">8dip</item> - <item name="list_item_header_text_color">@color/dialer_secondary_text_color</item> - <item name="list_item_header_text_size">14sp</item> - <item name="list_item_header_height">30dip</item> - <item name="list_item_data_width_weight">5</item> - <item name="list_item_label_width_weight">3</item> - <item name="contact_browser_list_padding_left">0dp</item> - <item name="contact_browser_list_padding_right">0dp</item> - <item name="contact_browser_background">@color/background_dialer_results</item> - <item name="list_item_name_text_color">@color/contact_list_name_text_color</item> - <item name="list_item_name_text_size">16sp</item> - <item name="list_item_text_indent">@dimen/contact_browser_list_item_text_indent</item> - <item name="list_item_text_offset_top">-2dp</item> - <!-- Favorites --> - <item name="favorites_padding_bottom">?android:attr/actionBarSize</item> - <item name="dialpad_key_button_touch_tint">@color/dialer_dialpad_touch_tint</item> - <item name="android:textAppearanceButton">@style/DialerButtonTextStyle</item> - - <!-- Video call icon --> - <item name="list_item_video_call_icon_size">48dip</item> - <item name="list_item_video_call_icon_margin">8dip</item> - - <item name="dialpad_style">@style/Dialpad.Light</item> - </style> - - <style name="DialtactsTheme" parent="DialtactsThemeBase"> - </style> - - <!-- Action bar overflow menu icon. White with no shadow. --> - <style name="DialtactsActionBarOverflowWhite" - parent="@android:style/Widget.Material.Light.ActionButton.Overflow"> - <item name="android:src">@drawable/quantum_ic_more_vert_white_24</item> - </style> + <style name="DialtactsTheme" parent="Dialer.ThemeBase"/> <style name="DialpadTheme" parent="DialtactsTheme"> - <item name="android:textColorPrimary">#FFFFFF</item> - </style> - - <style name="DialtactsThemeWithoutActionBarOverlay" parent="DialtactsTheme"> - <!-- Styles that require AppCompat compatibility, remember to update both sets --> - <item name="android:windowActionBarOverlay">false</item> - <item name="windowActionBarOverlay">false</item> - <item name="android:actionOverflowButtonStyle">@style/DialtactsActionBarOverflowWhite</item> - <item name="actionOverflowButtonStyle">@style/DialtactsActionBarOverflowWhite</item> - </style> - - <!-- Hide the actionbar title during the activity preview --> - <style name="DialtactsActivityTheme" parent="DialtactsTheme"> - <!-- Styles that require AppCompat compatibility, remember to update both sets --> - <item name="android:actionBarStyle">@style/DialtactsActionBarWithoutTitleStyle</item> - <item name="actionBarStyle">@style/DialtactsActionBarWithoutTitleStyle</item> - - <item name="android:fastScrollThumbDrawable">@drawable/fastscroll_thumb</item> - <item name="android:fastScrollTrackDrawable">@null</item> - </style> - - <style name="DialtactsActionBarStyle" parent="DialerActionBarBaseStyle"> - <!-- Styles that require AppCompat compatibility, remember to update both sets --> - <item name="android:background">@color/actionbar_background_color</item> - <item name="background">@color/actionbar_background_color</item> - <item name="android:titleTextStyle">@style/DialtactsActionBarTitleText</item> - <item name="titleTextStyle">@style/DialtactsActionBarTitleText</item> - <item name="android:elevation">@dimen/action_bar_elevation</item> - <item name="elevation">@dimen/action_bar_elevation</item> - <!-- Empty icon --> - <item name="android:icon">@android:color/transparent</item> - <item name="icon">@android:color/transparent</item> - <!-- Shift the title text to the right --> - <item name="android:contentInsetStart">@dimen/actionbar_contentInsetStart</item> - <item name="contentInsetStart">@dimen/actionbar_contentInsetStart</item> + <item name="android:textColorPrimary">?android:attr/textColorPrimaryInverse</item> </style> <style name="ActionModeStyle" parent="Widget.AppCompat.ActionMode"> - <item name="android:background">@color/actionbar_background_color</item> - <item name="background">@color/actionbar_background_color</item> + <item name="android:background">?android:attr/colorPrimary</item> + <item name="background">?android:attr/colorPrimary</item> <item name="closeItemLayout">@layout/action_mode_close_button</item> </style> - <style name="DialtactsActionBarWithoutTitleStyle" parent="DialtactsActionBarStyle"> - <!-- Styles that require AppCompat compatibility, remember to update both sets --> - <item name="android:displayOptions"></item> - <item name="displayOptions"></item> - <item name="android:height">@dimen/action_bar_height_large</item> - <item name="height">@dimen/action_bar_height_large</item> - <!-- Override ActionBar title offset to keep search box aligned left --> - <item name="android:contentInsetStart">0dp</item> - <item name="contentInsetStart">0dp</item> - <item name="android:contentInsetEnd">0dp</item> - <item name="contentInsetEnd">0dp</item> - </style> - <style name="DialtactsSearchBarThemeOverlay" parent="ThemeOverlay.AppCompat.Light"/> <!-- Text in the action bar at the top of the screen --> @@ -189,34 +73,42 @@ <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:textColorSecondary</item> + <item name="android:tint">?android:attr/textColorSecondary</item> <item name="android:importantForAccessibility">no</item> </style> - <!-- Style applied to the "Settings" screen. Keep in sync with SettingsLight in Telephony. --> - <style name="SettingsStyle" parent="DialtactsThemeWithoutActionBarOverlay"> - <!-- Setting text. --> - <item name="android:textColorPrimary">@color/settings_text_color_primary</item> - <!-- Setting description. --> - <item name="android:textColorSecondary">@color/settings_text_color_secondary</item> - <item name="android:windowBackground">@color/setting_background_color</item> - <item name="android:colorAccent">@color/dialtacts_theme_color</item> - <item name="android:textColorLink">@color/dialtacts_theme_color</item> - </style> - <style name="ManageBlockedNumbersStyle" parent="SettingsStyle"> <!-- Styles that require AppCompat compatibility, remember to update both sets --> <item name="android:windowActionBarOverlay">true</item> <item name="windowActionBarOverlay">true</item> <item name="android:actionBarStyle">@style/ManageBlockedNumbersActionBarStyle</item> - <item name="actionBarStyle">@style/ManageBlockedNumbersActionBarStyle</item> <item name="android:fastScrollTrackDrawable">@null</item> </style> - <style name="ManageBlockedNumbersActionBarStyle" parent="DialtactsActionBarWithoutTitleStyle"> + <style name="ManageBlockedNumbersActionBarStyle" parent="DialerActionBarBaseStyle"> <!-- Styles that require AppCompat compatibility, remember to update both sets --> <item name="android:height">@dimen/action_bar_height</item> <item name="height">@dimen/action_bar_height</item> + + <!-- Styles that require AppCompat compatibility, remember to update both sets --> + <item name="android:displayOptions"></item> + <item name="displayOptions"></item> + <!-- Override ActionBar title offset to keep search box aligned left --> + <item name="android:contentInsetStart">0dp</item> + <item name="contentInsetStart">0dp</item> + <item name="android:contentInsetEnd">0dp</item> + <item name="contentInsetEnd">0dp</item> + + <!-- Styles that require AppCompat compatibility, remember to update both sets --> + <item name="android:background">?android:attr/colorPrimary</item> + <item name="background">?android:attr/colorPrimary</item> + <item name="android:titleTextStyle">@style/DialtactsActionBarTitleText</item> + <item name="titleTextStyle">@style/DialtactsActionBarTitleText</item> + <item name="android:elevation">@dimen/action_bar_elevation</item> + <item name="elevation">@dimen/action_bar_elevation</item> + <!-- Empty icon --> + <item name="android:icon">@android:color/transparent</item> + <item name="icon">@android:color/transparent</item> </style> <style name="VoicemailPlaybackLayoutButtonStyle"> @@ -272,7 +164,7 @@ </style> <style name="PromoLinkStyle"> - <item name="android:textColor">@color/dialer_theme_color</item> + <item name="android:textColor">?android:attr/colorPrimary</item> <item name="android:fontFamily">"sans-serif-medium"</item> </style> |