summaryrefslogtreecommitdiff
path: root/java/com/android/dialer/calllog/ui/res
diff options
context:
space:
mode:
Diffstat (limited to 'java/com/android/dialer/calllog/ui/res')
-rw-r--r--java/com/android/dialer/calllog/ui/res/layout/new_call_log_entry.xml124
-rw-r--r--java/com/android/dialer/calllog/ui/res/layout/new_call_log_header.xml12
-rw-r--r--java/com/android/dialer/calllog/ui/res/values/colors.xml (renamed from java/com/android/dialer/calllog/ui/res/values/dimens.xml)18
-rw-r--r--java/com/android/dialer/calllog/ui/res/values/styles.xml8
4 files changed, 102 insertions, 60 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 77ba68124..093f866fc 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
@@ -19,33 +19,31 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- 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">
+ android:minHeight="72dp">
<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_width="40dp"
+ android:layout_height="40dp"
+ android:layout_marginStart="16dp"
+ android:layout_marginEnd="16dp"
android:layout_centerVertical="true"
- android:padding="@dimen/call_log_entry_photo_padding"
android:focusable="true"/>
- <LinearLayout
+ <!-- The frame layout is necessary to avoid clipping the icons and ellipsize the text when the
+ content is too wide to fit.
+ -->
+ <FrameLayout
+ android:id="@+id/primary_row"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_centerVertical="true"
android:layout_toEndOf="@+id/quick_contact_photo"
- android:layout_toStartOf="@+id/menu_button"
- android:orientation="vertical">
+ android:layout_toStartOf="@+id/menu_button">
- <!-- TODO(zachh): Optimize this layout -->
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginTop="14dp"
android:orientation="horizontal">
<TextView
@@ -53,57 +51,95 @@
style="@style/PrimaryText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginStart="@dimen/call_log_entry_photo_text_margin"/>
+ android:layout_weight="1"
+ android:layout_marginEnd="6dp"
+ android:ellipsize="end"
+ android:lineSpacingMultiplier="1.5"
+ android:singleLine="true"/>
- <!-- 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>
+ <ImageView
+ android:id="@+id/hd_icon"
+ android:layout_width="wrap_content"
+ android:layout_height="18dp"
+ android:layout_gravity="center_vertical"
+ android:src="@drawable/quantum_ic_hd_vd_theme_24"
+ />
- <!-- TODO(zachh): Optimize this layout -->
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
+ <ImageView
+ android:id="@+id/wifi_icon"
+ android:layout_width="wrap_content"
+ android:layout_height="18dp"
+ android:layout_gravity="center_vertical"
+ android:src="@drawable/quantum_ic_signal_wifi_4_bar_vd_theme_24"
+ />
- <!-- 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"
+ <ImageView
+ android:id="@+id/assisted_dial_icon"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginStart="12dp"
- android:layout_gravity="center_vertical"/>
+ android:layout_height="18dp"
+ android:layout_gravity="center_vertical"
+ android:src="@drawable/quantum_ic_language_vd_theme_24"
+ />
<TextView
- android:id="@+id/secondary_text"
- style="@style/SecondaryText"
+ android:id="@+id/call_count"
+ style="@style/PrimaryText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginStart="@dimen/call_log_entry_photo_text_margin"/>
+ android:layout_marginEnd="6dp"
+ android:lineSpacingMultiplier="1.5"/>
+
</LinearLayout>
+ </FrameLayout>
+
+ <LinearLayout
+ android:id="@+id/secondary_row"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/primary_row"
+ android:layout_toEndOf="@+id/quick_contact_photo"
+ android:orientation="horizontal">
+
+ <ImageView
+ android:id="@+id/call_type_icon"
+ android:layout_width="wrap_content"
+ android:layout_height="18dp"
+ android:layout_gravity="center_vertical"
+ />
<TextView
- android:id="@+id/phone_account"
+ 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"
- android:visibility="gone"/>
+ android:ellipsize="end"
+ android:lineSpacingMultiplier="1.4"
+ android:singleLine="true"/>
</LinearLayout>
+ <TextView
+ android:id="@+id/phone_account"
+ style="@style/SecondaryText"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/secondary_row"
+ android:layout_toEndOf="@+id/quick_contact_photo"
+ android:ellipsize="end"
+ android:singleLine="true"
+ android:visibility="gone"/>
+
<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_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="12dp"
+ android:layout_marginBottom="12dp"
+ android:layout_marginStart="4dp"
+ android:layout_marginEnd="4dp"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
+ android:padding="12dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:scaleType="center"
android:src="@drawable/quantum_ic_more_vert_vd_theme_24"
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
index 13575db55..e86ece534 100644
--- 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
@@ -16,14 +16,16 @@
-->
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
+ android:minHeight="48dp"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:height="48dp">
+ android:layout_height="wrap_content">
<TextView
android:id="@+id/new_call_log_header_text"
- style="@style/SecondaryText"
+ style="@style/SubHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginStart="@dimen/call_log_action_icon_margin_start"
- android:layout_centerVertical="true"/>
+ android:layout_marginStart="16dp"
+ android:layout_marginTop="8dp"
+ android:layout_centerVertical="true"
+ android:layout_gravity="center_vertical"/>
</RelativeLayout>
diff --git a/java/com/android/dialer/calllog/ui/res/values/dimens.xml b/java/com/android/dialer/calllog/ui/res/values/colors.xml
index bfb4c99d7..0a6d512ef 100644
--- a/java/com/android/dialer/calllog/ui/res/values/dimens.xml
+++ b/java/com/android/dialer/calllog/ui/res/values/colors.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- ~ Copyright (C) 2017 The Android Open Source Project
+ ~ 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.
@@ -14,15 +14,11 @@
~ See the License for the specific language governing permissions and
~ limitations under the License
-->
-<resources>
- <!-- call log entries -->
- <dimen name="call_log_entry_top_margin">6dp</dimen>
- <dimen name="call_log_entry_padding_bottom_end">16dp</dimen>
- <dimen name="call_log_entry_padding_top_start">12dp</dimen>
- <dimen name="call_log_entry_photo_size">48dp</dimen>
- <dimen name="call_log_entry_photo_padding">4dp</dimen>
- <dimen name="call_log_entry_photo_text_margin">8dp</dimen>
- <dimen name="call_log_entry_menu_button_size">48dp</dimen>
+<resources>
+ <color name="feature_icon_read_color">#9E9E9E</color>
+ <color name="feature_icon_unread_color">#474747</color>
-</resources>
+ <color name="call_type_icon_read_color">#757575</color>
+ <color name="call_type_icon_unread_color">#D32F2F</color>
+</resources> \ No newline at end of file
diff --git a/java/com/android/dialer/calllog/ui/res/values/styles.xml b/java/com/android/dialer/calllog/ui/res/values/styles.xml
index f8502370a..d521feed4 100644
--- a/java/com/android/dialer/calllog/ui/res/values/styles.xml
+++ b/java/com/android/dialer/calllog/ui/res/values/styles.xml
@@ -31,9 +31,17 @@
<item name="android:fontFamily">sans-serif</item>
</style>
+ <style name="phoneaccount_textview">
+ <item name="android:fontFamily">sans-serif</item>
+ </style>
+
<style name="secondary_textview_new_call">
<item name="android:textColor">@color/missed_call</item>
<item name="android:fontFamily">sans-serif-medium</item>
</style>
+ <style name="phoneaccount_textview_new_call">
+ <item name="android:fontFamily">sans-serif-medium</item>
+ </style>
+
</resources> \ No newline at end of file
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-07 12:46:40 +0000