diff options
author | calderwoodra <calderwoodra@google.com> | 2018-04-10 15:16:16 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-04-10 16:42:40 -0700 |
commit | a5f86bb8e89f2fdca4b6db947fe63eb7af1bf73e (patch) | |
tree | 6ad2320ef374eeafdccce97942093432d2834e30 /java/com/android/dialer/speeddial/res | |
parent | 3e98abd1a11c903340496b6563a21fd9ca921411 (diff) |
Implement the disambig dialog for favorite contacts.
Bug: 36841782,77760800
Test: DisambigDialogTest
PiperOrigin-RevId: 192354880
Change-Id: Ie7e9f0e3994d871ce6c90e4028131204ccb0a32a
Diffstat (limited to 'java/com/android/dialer/speeddial/res')
6 files changed, 73 insertions, 90 deletions
diff --git a/java/com/android/dialer/speeddial/res/layout/disambig_option_header_layout.xml b/java/com/android/dialer/speeddial/res/layout/disambig_option_header_layout.xml new file mode 100644 index 000000000..d331a0a6e --- /dev/null +++ b/java/com/android/dialer/speeddial/res/layout/disambig_option_header_layout.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ 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. + ~ 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 + --> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/disambig_header_container" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="8dp" + android:minHeight="56dp" + android:gravity="center_vertical" + android:paddingStart="24dp" + android:paddingEnd="24dp"> + + <TextView + android:id="@+id/disambig_header_phone_type" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + style="@style/PrimaryText"/> + + <TextView + android:id="@+id/disambig_header_phone_number" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + style="@style/SecondaryText"/> +</LinearLayout> 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 097ac4084..62f6ab5e1 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 @@ -15,89 +15,27 @@ ~ limitations under the License --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/disambig_option_container" - android:orientation="vertical" + android:id="@+id/option_container" + android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" + android:paddingStart="24dp" + android:paddingEnd="24dp" android:minHeight="56dp" - android:layout_marginBottom="8dp"> - - <LinearLayout - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:minHeight="56dp" - android:gravity="center_vertical" - android:paddingStart="24dp" - android:paddingEnd="24dp"> - - <TextView - android:id="@+id/phone_type" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - style="@style/PrimaryText"/> - - <TextView - android:id="@+id/phone_number" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - style="@style/SecondaryText"/> - </LinearLayout> - - <LinearLayout - android:id="@+id/video_call_container" - android:orientation="horizontal" - android:layout_width="match_parent" + android:background="?android:attr/selectableItemBackground"> + + <ImageView + android:id="@+id/disambig_option_image" + android:layout_width="24dp" + android:layout_height="24dp" + android:layout_gravity="center_vertical" + android:tint="@color/dialer_secondary_text_color"/> + + <TextView + android:id="@+id/disambig_option_text" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:paddingStart="24dp" - android:paddingEnd="24dp" - android:minHeight="56dp" - android:background="?android:attr/selectableItemBackground" - android:visibility="gone" - android:contentDescription="@string/disambig_option_video_call"> - - <ImageView - android:layout_width="24dp" - android:layout_height="24dp" - android:layout_gravity="center_vertical" - android:tint="@color/dialer_secondary_text_color" - android:src="@drawable/quantum_ic_videocam_vd_theme_24"/> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="12dp" - android:layout_gravity="center_vertical" - android:text="@string/disambig_option_video_call" - style="@style/PrimaryText"/> - </LinearLayout> - - <LinearLayout - android:id="@+id/voice_call_container" - android:orientation="horizontal" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingStart="24dp" - android:paddingEnd="24dp" - android:minHeight="56dp" - android:background="?android:attr/selectableItemBackground" - android:contentDescription="@string/disambig_option_voice_call"> - - <ImageView - android:id="@+id/disambig_option_icon" - android:layout_width="24dp" - android:layout_height="24dp" - android:layout_gravity="center_vertical" - android:tint="@color/dialer_secondary_text_color" - android:src="@drawable/quantum_ic_phone_vd_theme_24"/> - - <TextView - android:id="@+id/disambig_option_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="12dp" - android:layout_gravity="center_vertical" - android:text="@string/disambig_option_voice_call" - style="@style/PrimaryText"/> - </LinearLayout> + android:layout_marginStart="12dp" + android:layout_gravity="center_vertical" + style="@style/PrimaryText"/> </LinearLayout>
\ 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 b4af686b7..d4fa07d90 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 @@ -32,8 +32,7 @@ <com.android.dialer.speeddial.SquareImageView android:id="@+id/avatar" android:layout_width="match_parent" - android:layout_height="match_parent" - android:clickable="false"/> + android:layout_height="match_parent"/> <FrameLayout android:id="@+id/video_call_container" @@ -59,6 +58,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" + android:layout_marginStart="4dp" + android:layout_marginEnd="4dp" style="@style/PrimaryText"/> <TextView @@ -66,5 +67,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" + android:layout_marginStart="4dp" + android:layout_marginEnd="4dp" style="@style/SecondaryText"/> </LinearLayout>
\ 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 9f2dec931..67ef877ca 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 @@ -19,8 +19,6 @@ android:id="@+id/speed_dial_recycler_view" android:layout_width="match_parent" android:layout_height="match_parent" - android:paddingStart="16dp" - android:paddingEnd="16dp" android:clipToPadding="false" android:background="@color/background_dialer_light" android:paddingBottom="@dimen/floating_action_button_list_bottom_padding"/> diff --git a/java/com/android/dialer/speeddial/res/layout/speed_dial_header_layout.xml b/java/com/android/dialer/speeddial/res/layout/speed_dial_header_layout.xml index 0a84b41e6..15c00e45b 100644 --- a/java/com/android/dialer/speeddial/res/layout/speed_dial_header_layout.xml +++ b/java/com/android/dialer/speeddial/res/layout/speed_dial_header_layout.xml @@ -17,6 +17,8 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" android:minHeight="@dimen/dialer_list_item_min_height"> <TextView diff --git a/java/com/android/dialer/speeddial/res/layout/suggestion_row_layout.xml b/java/com/android/dialer/speeddial/res/layout/suggestion_row_layout.xml index 4281700f3..ff95b5906 100644 --- a/java/com/android/dialer/speeddial/res/layout/suggestion_row_layout.xml +++ b/java/com/android/dialer/speeddial/res/layout/suggestion_row_layout.xml @@ -18,22 +18,24 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" - android:minHeight="72dp"> + android:minHeight="72dp" + android:background="?android:attr/selectableItemBackground"> <QuickContactBadge android:id="@+id/avatar" android:layout_width="48dp" android:layout_height="48dp" - android:layout_centerVertical="true"/> + android:layout_centerVertical="true" + android:layout_marginStart="16dp"/> <LinearLayout android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginStart="56dp" android:layout_centerVertical="true" - android:layout_alignParentStart="true" - android:layout_toStartOf="@+id/overflow"> + android:layout_toEndOf="@+id/avatar" + android:layout_toStartOf="@+id/overflow" + android:layout_marginStart="8dp"> <TextView android:id="@+id/name" |