diff options
Diffstat (limited to 'java/com/android/dialer/app/res/layout')
15 files changed, 158 insertions, 315 deletions
diff --git a/java/com/android/dialer/app/res/layout/account_filter_header_for_phone_favorite.xml b/java/com/android/dialer/app/res/layout/account_filter_header_for_phone_favorite.xml deleted file mode 100644 index c6e186257..000000000 --- a/java/com/android/dialer/app/res/layout/account_filter_header_for_phone_favorite.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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. ---> - -<!-- Layout showing the type of account filter for phone favorite screen - (or, new phone "all" screen). - This is very similar to account_filter_header.xml but different in its - top padding. --> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/account_filter_header_container" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginStart="@dimen/contact_browser_list_header_left_margin" - android:layout_marginEnd="@dimen/contact_browser_list_header_right_margin" - android:paddingTop="8dip" - android:background="?android:attr/selectableItemBackground" - android:orientation="vertical" - android:visibility="gone"> - <TextView - android:id="@+id/account_filter_header" - style="@style/ContactListSeparatorTextViewStyle" - android:paddingStart="@dimen/contact_browser_list_item_text_indent"/> - <TextView - android:id="@+id/contact_list_all_empty" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="@dimen/contact_phone_list_empty_description_padding" - android:paddingBottom="@dimen/contact_phone_list_empty_description_padding" - android:paddingStart="8dip" - android:text="@string/listFoundAllContactsZero" - android:textColor="?android:attr/textColorSecondary" - android:textSize="@dimen/contact_phone_list_empty_description_size" - android:visibility="gone"/> -</LinearLayout> diff --git a/java/com/android/dialer/app/res/layout/all_contacts_activity.xml b/java/com/android/dialer/app/res/layout/action_mode_close_button.xml index 72f0a147f..4cb85d458 100644 --- a/java/com/android/dialer/app/res/layout/all_contacts_activity.xml +++ b/java/com/android/dialer/app/res/layout/action_mode_close_button.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2013 The Android Open Source Project +<!-- Copyright (C) 2017 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. @@ -14,13 +14,18 @@ limitations under the License. --> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/all_contacts_frame" - android:layout_width="match_parent" - android:layout_height="match_parent"> - <fragment - android:id="@+id/all_contacts_fragment" - android:layout_width="match_parent" +<ImageView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/action_mode_close_button" + style="?attr/actionModeCloseButtonStyle" + android:layout_width="wrap_content" android:layout_height="match_parent" - android:name="com.android.dialer.app.list.AllContactsFragment"/> -</FrameLayout> + android:layout_marginEnd="16dip" + android:layout_marginRight="16dip" + android:paddingStart="8dp" + android:paddingLeft="8dp" + android:clickable="true" + android:contentDescription="@string/description_cancel_multi_select" + android:focusable="true" + android:src="@drawable/quantum_ic_close_white_24"/> + + diff --git a/java/com/android/dialer/app/res/layout/all_contacts_fragment.xml b/java/com/android/dialer/app/res/layout/all_contacts_fragment.xml index 17a45208d..422c52991 100644 --- a/java/com/android/dialer/app/res/layout/all_contacts_fragment.xml +++ b/java/com/android/dialer/app/res/layout/all_contacts_fragment.xml @@ -45,7 +45,7 @@ android:cropToPadding="false" android:clipToPadding="false"/> - <com.android.dialer.app.widget.EmptyContentView + <com.android.dialer.widget.EmptyContentView android:id="@+id/empty_list_view" android:layout_width="match_parent" android:layout_height="wrap_content" 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 4e2b1887c..a5e532698 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 @@ -15,26 +15,27 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/calllog_frame" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - <com.android.contacts.common.list.ViewPagerTabs - android:id="@+id/viewpager_header" - style="@style/DialtactsActionBarTabTextStyle" + android:id="@+id/calllog_frame" android:layout_width="match_parent" - android:layout_height="@dimen/tab_height" - android:layout_gravity="top" - android:elevation="@dimen/tab_elevation" - android:orientation="horizontal" - android:textAllCaps="true"/> + android:layout_height="match_parent" + android:background="@color/background_dialer_light" + android:orientation="vertical"> + <com.android.contacts.common.list.ViewPagerTabs + android:id="@+id/viewpager_header" + style="@style/DialtactsActionBarTabTextStyle" + android:layout_width="match_parent" + android:layout_height="@dimen/tab_height" + android:layout_gravity="top" + android:elevation="@dimen/tab_elevation" + android:orientation="horizontal" + android:textAllCaps="true"/> <android.support.v4.view.ViewPager - android:id="@+id/call_log_pager" - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1"/> + android:id="@+id/call_log_pager" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1"/> <RelativeLayout - android:id="@+id/floating_action_button_container" - android:layout_width="0dp" - android:layout_height="0dp"/> + android:id="@+id/floating_action_button_container" + android:layout_width="0dp" + android:layout_height="0dp"/> </LinearLayout> 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 64f7c10e6..efc08fbb4 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 @@ -18,9 +18,39 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/background_dialer_call_log" android:orientation="vertical"> + <LinearLayout + android:id="@+id/multi_select_select_all_view_content" + android:layout_width="match_parent" + android:layout_height="@dimen/tab_height" + android:layout_gravity="start" + android:background="@color/actionbar_background_color" + android:orientation="horizontal" + android:visibility="gone"> + + <ImageView + android:id="@+id/select_all_view_icon" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:paddingLeft="@dimen/select_all_icon_padding" + android:paddingRight="@dimen/select_all_icon_padding" + android:gravity="center_vertical" + android:contentDescription="@string/select_all" + android:src="@drawable/ic_empty_check_mark_white_24dp"/> + <TextView + android:id="@+id/select_all_view_text" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:paddingLeft="@dimen/select_all_text_left_padding" + android:gravity="center_vertical" + android:text="@string/select_all" + android:textAllCaps="true" + android:textStyle="bold" + android:textColor="@color/remove_text_color" + android:textSize="@dimen/select_all_text_size"/> + </LinearLayout> + <FrameLayout android:id="@+id/modal_message_container" android:layout_width="match_parent" @@ -34,10 +64,9 @@ android:paddingBottom="@dimen/floating_action_button_list_bottom_padding" android:paddingStart="@dimen/call_log_horizontal_margin" android:paddingEnd="@dimen/call_log_horizontal_margin" - android:background="@color/background_dialer_call_log" android:clipToPadding="false"/> - <com.android.dialer.app.widget.EmptyContentView + <com.android.dialer.widget.EmptyContentView android:id="@+id/empty_list_view" android:layout_width="match_parent" android:layout_height="0dp" 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 0fbbb9dd1..e9679242f 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 @@ -65,7 +65,7 @@ android:layout_height="wrap_content" > - <QuickContactBadge + <com.android.dialer.app.calllog.DialerQuickContactBadge android:id="@+id/quick_contact_photo" android:layout_width="@dimen/contact_photo_size" android:layout_height="@dimen/contact_photo_size" @@ -80,7 +80,7 @@ android:layout_width="@dimen/contact_photo_size" android:layout_height="@dimen/contact_photo_size" android:visibility="gone" - android:src="@drawable/quantum_ic_check_circle_googblue_24" /> + android:src="@drawable/ic_check_mark_48dp" /> </FrameLayout> @@ -148,17 +148,34 @@ android:visibility="gone" android:singleLine="true"/> - <TextView - android:id="@+id/voicemail_transcription" + <LinearLayout + android:id="@+id/transcription" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/call_log_icon_margin" - android:textColor="@color/call_log_voicemail_transcript_color" - android:textSize="@dimen/call_log_voicemail_transcription_text_size" - android:ellipsize="marquee" android:visibility="gone" - android:singleLine="false" - android:maxLines="10"/> + android:orientation="vertical"> + + <TextView + android:id="@+id/voicemail_transcription_branding" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/call_log_voicemail_transcript_branding_color" + android:textSize="@dimen/call_log_voicemail_transcription_text_size" + android:paddingBottom="2dp" + android:singleLine="true"/> + + <TextView + android:id="@+id/voicemail_transcription" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/call_log_voicemail_transcript_color" + android:textSize="@dimen/call_log_voicemail_transcription_text_size" + android:ellipsize="marquee" + android:singleLine="false" + android:maxLines="10"/> + + </LinearLayout> </LinearLayout> diff --git a/java/com/android/dialer/app/res/layout/call_log_list_item_actions.xml b/java/com/android/dialer/app/res/layout/call_log_list_item_actions.xml index d3a553130..ec9e5a00e 100644 --- a/java/com/android/dialer/app/res/layout/call_log_list_item_actions.xml +++ b/java/com/android/dialer/app/res/layout/call_log_list_item_actions.xml @@ -35,8 +35,7 @@ <LinearLayout android:id="@+id/call_action" - style="@style/CallLogActionStyle" - android:paddingTop="@dimen/call_log_actions_top_padding"> + style="@style/CallLogActionStyle"> <ImageView style="@style/CallLogActionIconStyle" @@ -50,7 +49,7 @@ <TextView android:id="@+id/call_action_text" style="@style/CallLogActionTextStyle" - android:text="@string/description_call_log_call_action"/> + android:text="@string/call"/> <TextView android:id="@+id/call_type_or_location_text" @@ -135,7 +134,7 @@ <ImageView style="@style/CallLogActionIconStyle" - android:src="@drawable/ic_call_and_share"/> + android:src="@drawable/ic_phone_attach"/> <TextView style="@style/CallLogActionTextStyle" diff --git a/java/com/android/dialer/app/res/layout/dialpad_chooser_list_item.xml b/java/com/android/dialer/app/res/layout/dialpad_chooser_list_item.xml deleted file mode 100644 index e00529614..000000000 --- a/java/com/android/dialer/app/res/layout/dialpad_chooser_list_item.xml +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2008 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. ---> - -<!-- Layout of a single item in the Dialer's "Dialpad chooser" UI. --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="horizontal"> - - <ImageView - android:id="@+id/icon" - android:layout_width="64dp" - android:layout_height="64dp" - android:scaleType="center"/> - - <TextView - android:id="@+id/text" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_gravity="center_vertical" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textColor="@color/dialpad_primary_text_color"/> - -</LinearLayout> diff --git a/java/com/android/dialer/app/res/layout/dialpad_fragment.xml b/java/com/android/dialer/app/res/layout/dialpad_fragment.xml deleted file mode 100644 index dd6dab747..000000000 --- a/java/com/android/dialer/app/res/layout/dialpad_fragment.xml +++ /dev/null @@ -1,71 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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. ---> -<view xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - class="com.android.dialer.app.dialpad.DialpadFragment$DialpadSlidingRelativeLayout" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <!-- spacer view --> - <View - android:id="@+id/spacer" - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" - android:background="#00000000"/> - <!-- Dialpad shadow --> - <View - android:layout_width="match_parent" - android:layout_height="@dimen/shadow_length" - android:background="@drawable/shadow_fade_up"/> - <include layout="@layout/dialpad_view"/> - <!-- "Dialpad chooser" UI, shown only when the user brings up the - Dialer while a call is already in progress. - When this UI is visible, the other Dialer elements - (the textfield/button and the dialpad) are hidden. --> - <ListView - android:id="@+id/dialpadChooser" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@color/background_dialer_light" - android:visibility="gone"/> - - </LinearLayout> - - <!-- Margin bottom and alignParentBottom don't work well together, so use a Space instead. --> - <Space - android:id="@+id/dialpad_floating_action_button_margin_bottom" - android:layout_width="match_parent" - android:layout_height="@dimen/floating_action_button_margin_bottom" - android:layout_alignParentBottom="true"/> - - <android.support.design.widget.FloatingActionButton - android:id="@+id/dialpad_floating_action_button" - android:layout_width="@dimen/floating_action_button_width" - android:layout_height="@dimen/floating_action_button_height" - android:layout_above="@id/dialpad_floating_action_button_margin_bottom" - android:layout_centerHorizontal="true" - android:src="@drawable/quantum_ic_call_white_24" - android:contentDescription="@string/description_dial_button" - app:elevation="@dimen/floating_action_button_translation_z" - app:backgroundTint="@color/dialpad_fab_green"/> -</view> diff --git a/java/com/android/dialer/app/res/layout/empty_content_view.xml b/java/com/android/dialer/app/res/layout/empty_content_view.xml deleted file mode 100644 index 96a6a0262..000000000 --- a/java/com/android/dialer/app/res/layout/empty_content_view.xml +++ /dev/null @@ -1,54 +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. ---> - -<merge xmlns:android="http://schemas.android.com/apk/res/android"> - <ImageView - android:id="@+id/emptyListViewImage" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:gravity="center_horizontal"/> - - <TextView - android:id="@+id/emptyListViewMessage" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="8dp" - android:paddingBottom="8dp" - 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"/> - - <TextView - android:id="@+id/emptyListViewAction" - style="@style/TextActionStyle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:paddingTop="8dp" - android:paddingBottom="8dp" - android:paddingLeft="16dp" - android:paddingRight="16dp" - android:background="?android:attr/selectableItemBackground" - android:clickable="true" - android:gravity="center_horizontal"/> - - <Space - android:layout_width="match_parent" - android:layout_height="40dp"/> - -</merge> diff --git a/java/com/android/dialer/app/res/layout/empty_content_view_dialpad_search.xml b/java/com/android/dialer/app/res/layout/empty_content_view_dialpad_search.xml index e245aaca0..1d2047982 100644 --- a/java/com/android/dialer/app/res/layout/empty_content_view_dialpad_search.xml +++ b/java/com/android/dialer/app/res/layout/empty_content_view_dialpad_search.xml @@ -16,7 +16,7 @@ <merge xmlns:android="http://schemas.android.com/apk/res/android"> <ImageView - android:id="@+id/emptyListViewImage" + android:id="@+id/empty_list_view_image" android:layout_height="0dp" android:layout_weight="1" android:layout_width="match_parent" @@ -24,7 +24,7 @@ android:gravity="center_horizontal" /> <TextView - android:id="@+id/emptyListViewMessage" + android:id="@+id/empty_list_view_message" android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_horizontal|top" @@ -36,7 +36,7 @@ android:paddingBottom="8dp"/> <TextView - android:id="@+id/emptyListViewAction" + android:id="@+id/empty_list_view_action" android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center_horizontal" 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 41fe89165..eab98d261 100644 --- a/java/com/android/dialer/app/res/layout/keyguard_preview.xml +++ b/java/com/android/dialer/app/res/layout/keyguard_preview.xml @@ -15,9 +15,11 @@ ~ limitations under the License --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical"> + android:orientation="vertical" + tools:ignore="UnusedResources"> <View android:layout_width="match_parent" android:layout_height="25dp" 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 442b428f2..95961729d 100644 --- a/java/com/android/dialer/app/res/layout/lists_fragment.xml +++ b/java/com/android/dialer/app/res/layout/lists_fragment.xml @@ -15,41 +15,41 @@ --> <FrameLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/lists_frame" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:animateLayoutChanges="true"> - - <LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/lists_frame" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical"> + android:animateLayoutChanges="true"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> <!-- TODO: Apply background color to ActionBar instead of a FrameLayout. For now, this is the easiest way to preserve correct pane scrolling and searchbar collapse/expand behaviors. --> <FrameLayout - android:layout_width="match_parent" - android:layout_height="@dimen/action_bar_height_large" - android:background="@color/actionbar_background_color" - android:elevation="@dimen/tab_elevation"/> + android:layout_width="match_parent" + android:layout_height="@dimen/action_bar_height_large" + android:background="@color/actionbar_background_color" + android:elevation="@dimen/tab_elevation"/> <com.android.contacts.common.list.ViewPagerTabs - android:id="@+id/lists_pager_header" - style="@style/DialtactsActionBarTabTextStyle" - android:layout_width="match_parent" - android:layout_height="@dimen/tab_height" - android:layout_gravity="top" - android:elevation="@dimen/tab_elevation" - android:orientation="horizontal" - android:textAllCaps="true"/> - - <android.support.v4.view.ViewPager - android:id="@+id/lists_pager" - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1"/> + android:id="@+id/lists_pager_header" + style="@style/DialtactsActionBarTabTextStyle" + android:layout_width="match_parent" + android:layout_height="@dimen/tab_height" + android:layout_gravity="top" + android:elevation="@dimen/tab_elevation" + android:orientation="horizontal" + android:textAllCaps="true"/> + + <com.android.dialer.app.list.DialerViewPager + android:id="@+id/lists_pager" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1"/> </LinearLayout> @@ -58,38 +58,38 @@ This is required since drag and drop event is only sent to views are visible when drag starts. --> <com.android.dialer.app.list.RemoveView - android:id="@+id/remove_view" - android:layout_width="match_parent" - android:layout_height="@dimen/tab_height" - android:layout_marginTop="@dimen/action_bar_height_large" - android:contentDescription="@string/remove_contact" - android:importantForAccessibility="no"> + android:id="@+id/remove_view" + android:layout_width="match_parent" + android:layout_height="@dimen/tab_height" + android:layout_marginTop="@dimen/action_bar_height_large" + android:contentDescription="@string/remove_contact" + android:importantForAccessibility="no"> <LinearLayout - android:id="@+id/remove_view_content" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@color/actionbar_background_color" - android:gravity="center" - android:orientation="horizontal" - android:visibility="gone"> + android:id="@+id/remove_view_content" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/actionbar_background_color" + android:gravity="center" + android:orientation="horizontal" + android:visibility="gone"> <ImageView - android:id="@+id/remove_view_icon" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp" - android:src="@drawable/ic_remove" - android:tint="@color/remove_text_color"/> + android:id="@+id/remove_view_icon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" + android:src="@drawable/ic_remove" + android:tint="@color/remove_text_color"/> <TextView - android:id="@+id/remove_view_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/remove_contact" - android:textColor="@color/remove_text_color" - android:textSize="@dimen/remove_text_size"/> + android:id="@+id/remove_view_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/remove_contact" + android:textColor="@color/remove_text_color" + android:textSize="@dimen/remove_text_size"/> </LinearLayout> 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 c02512d80..bb6a5f7de 100644 --- a/java/com/android/dialer/app/res/layout/search_edittext.xml +++ b/java/com/android/dialer/app/res/layout/search_edittext.xml @@ -29,7 +29,7 @@ android:padding="@dimen/search_box_search_icon_padding" android:importantForAccessibility="no" android:scaleType="center" - android:src="@drawable/quantum_ic_search_white_24" + android:src="@drawable/quantum_ic_search_vd_theme_24" android:tint="@color/searchbox_icon_tint"/> <TextView diff --git a/java/com/android/dialer/app/res/layout/speed_dial_fragment.xml b/java/com/android/dialer/app/res/layout/speed_dial_fragment.xml index c778c6bc4..3fa3be229 100644 --- a/java/com/android/dialer/app/res/layout/speed_dial_fragment.xml +++ b/java/com/android/dialer/app/res/layout/speed_dial_fragment.xml @@ -41,7 +41,7 @@ android:numColumns="@integer/contact_tile_column_count_in_favorites"/> </FrameLayout> - <com.android.dialer.app.widget.EmptyContentView + <com.android.dialer.widget.EmptyContentView android:id="@+id/empty_list_view" android:layout_width="match_parent" android:layout_height="wrap_content" |