diff options
Diffstat (limited to 'java/com/android/dialer/calllog/ui/res/layout')
| -rw-r--r-- | java/com/android/dialer/calllog/ui/res/layout/new_call_log_entry.xml | 98 | ||||
| -rw-r--r-- | java/com/android/dialer/calllog/ui/res/layout/new_call_log_header.xml | 29 |
2 files changed, 115 insertions, 12 deletions
diff --git a/java/com/android/dialer/calllog/ui/res/layout/new_call_log_entry.xml b/java/com/android/dialer/calllog/ui/res/layout/new_call_log_entry.xml index 99797fab4..77ba68124 100644 --- a/java/com/android/dialer/calllog/ui/res/layout/new_call_log_entry.xml +++ b/java/com/android/dialer/calllog/ui/res/layout/new_call_log_entry.xml @@ -15,23 +15,97 @@ ~ limitations under the License --> -<LinearLayout +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" - android:padding="8dp" - android:orientation="vertical"> + android:layout_marginTop="@dimen/call_log_entry_top_margin" + android:paddingTop="@dimen/call_log_entry_padding_top_start" + android:paddingBottom="@dimen/call_log_entry_padding_bottom_end" + android:paddingStart="@dimen/call_log_entry_padding_top_start" + android:paddingEnd="@dimen/call_log_entry_padding_bottom_end" + android:gravity="center_vertical"> - <TextView - android:id="@+id/contact_name" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - style="@style/PrimaryText"/> + <QuickContactBadge + android:id="@+id/quick_contact_photo" + android:layout_width="@dimen/call_log_entry_photo_size" + android:layout_height="@dimen/call_log_entry_photo_size" + android:layout_centerVertical="true" + android:padding="@dimen/call_log_entry_photo_padding" + android:focusable="true"/> - <TextView - android:id="@+id/timestamp" + <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - style="@style/SecondaryText"/> + android:layout_centerVertical="true" + android:layout_toEndOf="@+id/quick_contact_photo" + android:layout_toStartOf="@+id/menu_button" + android:orientation="vertical"> + + <!-- TODO(zachh): Optimize this layout --> + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <TextView + android:id="@+id/primary_text" + style="@style/PrimaryText" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/call_log_entry_photo_text_margin"/> + + <!-- HD and Wifi icons are shown adjacent to primary text. Call types are shown adjacent to + secondary text (below). --> + <com.android.dialer.calllogutils.CallTypeIconsView + android:id="@+id/primary_call_type_icons" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="12dp" + android:layout_gravity="center_vertical"/> + + </LinearLayout> + + <!-- TODO(zachh): Optimize this layout --> + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <!-- Only call types are shown adjacent to secondary text. HD and Wifi icons are shown + adjacent to primary text (above). --> + <com.android.dialer.calllogutils.CallTypeIconsView + android:id="@+id/secondary_call_type_icons" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="12dp" + android:layout_gravity="center_vertical"/> + + <TextView + android:id="@+id/secondary_text" + style="@style/SecondaryText" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/call_log_entry_photo_text_margin"/> + </LinearLayout> + + <TextView + android:id="@+id/phone_account" + style="@style/SecondaryText" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/call_log_entry_photo_text_margin" + android:visibility="gone"/> + </LinearLayout> -</LinearLayout>
\ No newline at end of file + <ImageView + android:id="@+id/menu_button" + android:layout_width="@dimen/call_log_entry_menu_button_size" + android:layout_height="@dimen/call_log_entry_menu_button_size" + android:layout_alignParentEnd="true" + android:layout_centerVertical="true" + android:background="?android:attr/selectableItemBackgroundBorderless" + android:scaleType="center" + android:src="@drawable/quantum_ic_more_vert_vd_theme_24" + android:tint="@color/dialer_secondary_text_color"/> +</RelativeLayout> diff --git a/java/com/android/dialer/calllog/ui/res/layout/new_call_log_header.xml b/java/com/android/dialer/calllog/ui/res/layout/new_call_log_header.xml new file mode 100644 index 000000000..13575db55 --- /dev/null +++ b/java/com/android/dialer/calllog/ui/res/layout/new_call_log_header.xml @@ -0,0 +1,29 @@ +<?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 + --> +<RelativeLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:height="48dp"> + <TextView + android:id="@+id/new_call_log_header_text" + style="@style/SecondaryText" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/call_log_action_icon_margin_start" + android:layout_centerVertical="true"/> +</RelativeLayout> |