diff options
author | calderwoodra <calderwoodra@google.com> | 2018-05-02 15:26:04 -0700 |
---|---|---|
committer | Weijia Xu <weijiaxu@google.com> | 2018-05-04 06:16:14 +0000 |
commit | b3bd5f5c9687feaa795dc630a88790ccf6e7e99e (patch) | |
tree | 65eeb2a5363a49052e47af8cc15811f0c6a10c14 /java/com/android/dialer/speeddial/res/layout | |
parent | 1ab3e318f68db528d4242bc9ebc62e907eb11939 (diff) |
Tuned Speed Dial UI according to red lines.
Bug: 78490736
Test: manual
PiperOrigin-RevId: 195161904
Change-Id: I7d3600267223fcfafae42f3f52bfd6cfff8b9146
Diffstat (limited to 'java/com/android/dialer/speeddial/res/layout')
6 files changed, 54 insertions, 31 deletions
diff --git a/java/com/android/dialer/speeddial/res/layout/disambig_dialog_divider.xml b/java/com/android/dialer/speeddial/res/layout/disambig_dialog_divider.xml new file mode 100644 index 000000000..a743cccff --- /dev/null +++ b/java/com/android/dialer/speeddial/res/layout/disambig_dialog_divider.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2018 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" + android:layout_width="match_parent" + android:layout_height="1dp" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" + android:background="#12000000"/>
\ 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 0272176ab..aec081385 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 @@ -26,7 +26,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_vertical" - android:minHeight="64dp" + android:minHeight="56dp" android:paddingStart="24dp" android:paddingEnd="24dp" android:elevation="1dp" @@ -40,7 +40,8 @@ android:id="@+id/disambig_scrollview" android:layout_width="match_parent" android:layout_height="wrap_content" - app:maxHeight="240dp"> + android:minHeight="168dp" + app:maxHeight="256dp"> <LinearLayout android:id="@+id/communication_avenue_container" @@ -54,8 +55,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="bottom" - android:minHeight="56dp" - android:padding="12dp" + android:minHeight="64dp" android:elevation="4dp" android:background="@android:color/white"> @@ -63,6 +63,8 @@ android:id="@+id/remember_this_choice_checkbox" android:layout_width="match_parent" android:layout_height="48dp" - android:text="@string/speed_dial_remember_this_choice"/> + android:textSize="14sp" + android:text="@string/speed_dial_remember_this_choice" + style="@style/DialerCheckboxStyle"/> </FrameLayout> </LinearLayout>
\ No newline at end of file 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 index d331a0a6e..22a5d1b52 100644 --- 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 @@ -14,27 +14,15 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License --> -<LinearLayout +<TextView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/disambig_header_container" - android:orientation="vertical" + android:id="@+id/disambig_header_phone_label" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="8dp" - android:minHeight="56dp" android:gravity="center_vertical" + android:minHeight="48dp" 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> + android:paddingEnd="24dp" + android:textSize="14sp" + android:textColor="#757575" + style="@style/PrimaryText"/> 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 62f6ab5e1..a1a5b2941 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 @@ -35,7 +35,7 @@ android:id="@+id/disambig_option_text" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="12dp" + android:layout_marginStart="16dp" 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 d4fa07d90..134196da7 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 @@ -24,21 +24,24 @@ <FrameLayout android:id="@+id/avatar_container" - android:layout_width="104dp" + android:layout_width="wrap_content" android:layout_height="104dp" android:layout_gravity="center_horizontal" android:layout_marginBottom="8dp"> <com.android.dialer.speeddial.SquareImageView android:id="@+id/avatar" - android:layout_width="match_parent" - android:layout_height="match_parent"/> + android:layout_width="104dp" + android:layout_height="104dp" + android:layout_marginStart="12dp" + android:layout_marginEnd="12dp"/> <FrameLayout android:id="@+id/video_call_container" android:layout_width="36dp" android:layout_height="36dp" - android:layout_gravity="bottom|end"> + android:layout_gravity="bottom|end" + android:layout_marginEnd="12dp"> <ImageView android:layout_width="match_parent" @@ -60,6 +63,10 @@ android:layout_gravity="center_horizontal" android:layout_marginStart="4dp" android:layout_marginEnd="4dp" + android:layout_marginTop="8dp" + android:layout_marginBottom="1dp" + android:fontFamily="sans-serif-medium" + android:textSize="14sp" style="@style/PrimaryText"/> <TextView @@ -69,5 +76,6 @@ android:layout_gravity="center_horizontal" android:layout_marginStart="4dp" android:layout_marginEnd="4dp" + android:layout_marginBottom="17dp" style="@style/SecondaryText"/> </LinearLayout>
\ No newline at end of file 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 15c00e45b..1605e8c98 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 @@ -19,7 +19,7 @@ android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" - android:minHeight="@dimen/dialer_list_item_min_height"> + android:minHeight="48dp"> <TextView android:id="@+id/speed_dial_header_text" @@ -36,7 +36,9 @@ android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:minHeight="@dimen/dialer_touch_target_min_size" - android:minWidth="@dimen/dialer_button_min_width" + android:minWidth="48dp" + android:paddingStart="8dp" + android:paddingEnd="8dp" android:text="@string/speed_dial_add_button_text" android:textColor="@color/dialer_theme_color" style="@style/Widget.AppCompat.Button.Borderless"/> |