summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorTyler Gunn <tgunn@google.com>2014-05-22 16:36:14 -0700
committerTyler Gunn <tgunn@google.com>2014-05-23 15:10:33 +0000
commitf3f706aeeea69fb2ac4898c4038f9839f456f39c (patch)
tree9911ba3ed7f05b4c9991fd03bae0a033cd1511e7 /res
parent13f6fd048f0cdc26e9dc6b78a02515e72fff2e27 (diff)
Cleanup of call log entry horizontal padding and RTL support. DO NOT MERGE
Bug: 15165669 Change-Id: Iceba7fdfcecb79c3d1ef30505e27b5274da67111 (cherry picked from commit b2a0168c53ef96ac26a2abb8dcb2c34b49c9becc)
Diffstat (limited to 'res')
-rw-r--r--res/layout/call_log_list_item.xml6
-rw-r--r--res/layout/call_log_list_item_actions.xml14
-rw-r--r--res/values/dimens.xml10
3 files changed, 12 insertions, 18 deletions
diff --git a/res/layout/call_log_list_item.xml b/res/layout/call_log_list_item.xml
index bdf14774e..9899424c4 100644
--- a/res/layout/call_log_list_item.xml
+++ b/res/layout/call_log_list_item.xml
@@ -28,7 +28,7 @@
android:id="@+id/call_log_day_group_label"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginStart="@dimen/call_log_outer_margin"
+ android:layout_marginStart="@dimen/call_log_start_margin"
android:layout_marginEnd="@dimen/call_log_outer_margin"
android:textColor="?attr/call_log_secondary_text_color"
android:textSize="@dimen/call_log_secondary_text_size"
@@ -52,7 +52,7 @@
android:background="@drawable/call_log_background"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingStart="@dimen/call_log_outer_margin"
+ android:paddingStart="@dimen/call_log_start_margin"
android:paddingEnd="@dimen/call_log_outer_margin"
android:paddingTop="@dimen/call_log_outer_margin"
android:paddingBottom="@dimen/call_log_outer_margin"
@@ -75,7 +75,7 @@
android:layout_weight="1"
android:orientation="vertical"
android:gravity="center_vertical"
- android:layout_marginStart="@dimen/call_log_inner_margin"
+ android:layout_marginStart="@dimen/call_log_start_margin"
>
<TextView
android:id="@+id/name"
diff --git a/res/layout/call_log_list_item_actions.xml b/res/layout/call_log_list_item_actions.xml
index 9ee9a0fa5..3a93575c1 100644
--- a/res/layout/call_log_list_item_actions.xml
+++ b/res/layout/call_log_list_item_actions.xml
@@ -24,7 +24,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/call_log_action_height"
android:orientation="horizontal"
- android:paddingLeft="@dimen/call_log_actions_left_padding"
+ android:paddingStart="@dimen/call_log_actions_left_padding"
android:visibility="visible"
android:importantForAccessibility="1"
>
@@ -35,8 +35,8 @@
android:gravity="center"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:paddingLeft="@dimen/call_log_action_horizontal_padding"
- android:paddingRight="@dimen/call_log_action_horizontal_padding"
+ android:paddingStart="@dimen/call_log_action_horizontal_padding"
+ android:paddingEnd="@dimen/call_log_action_horizontal_padding"
android:text="@string/call_log_action_call_back"
android:textColor="@color/call_log_action_text"
android:textSize="@dimen/call_log_secondary_text_size"
@@ -51,8 +51,8 @@
android:gravity="center"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:paddingLeft="@dimen/call_log_action_horizontal_padding"
- android:paddingRight="@dimen/call_log_action_horizontal_padding"
+ android:paddingStart="@dimen/call_log_action_horizontal_padding"
+ android:paddingEnd="@dimen/call_log_action_horizontal_padding"
android:text="@string/call_log_action_voicemail"
android:textColor="@color/call_log_action_text"
android:textSize="@dimen/call_log_secondary_text_size"
@@ -67,8 +67,8 @@
android:gravity="center"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:paddingLeft="@dimen/call_log_action_horizontal_padding"
- android:paddingRight="@dimen/call_log_action_horizontal_padding"
+ android:paddingStart="@dimen/call_log_action_horizontal_padding"
+ android:paddingEnd="@dimen/call_log_action_horizontal_padding"
android:text="@string/call_log_action_details"
android:textColor="?attr/call_log_secondary_text_color"
android:textSize="@dimen/call_log_secondary_text_size"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index f399e368e..d2ef1cb7c 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -31,18 +31,12 @@
<dimen name="call_log_icon_margin">4dip</dimen>
<dimen name="call_log_inner_margin">8dip</dimen>
<dimen name="call_log_outer_margin">8dp</dimen>
+ <dimen name="call_log_start_margin">16dp</dimen>
<dimen name="call_log_indent_margin">24dip</dimen>
<dimen name="call_log_list_item_height">56dip</dimen>
<dimen name="call_log_list_contact_photo_size">40dip</dimen>
<dimen name="call_detail_contact_name_margin">24dip</dimen>
<dimen name="call_detail_button_spacing">2dip</dimen>
- <!-- Defines the vertical margin for the vertical separator between
- the main area of a call log entry and the secondary action button. -->
- <dimen name="call_log_list_item_vertical_divider_margin">17dp</dimen>
-
- <!-- Defines the width of the vertical separator between
- the main area of a call log entry and the secondary action button. -->
- <dimen name="call_log_list_item_vertical_divider_width">1dp</dimen>
<!-- Match call_button_height to Phone's dimens/in_call_end_button_height -->
<dimen name="call_button_height">74dp</dimen>
@@ -123,7 +117,7 @@
to the right of the contact badge. Adjust when any of the following change:
call_log_action_horizontal_padding
call_log_list_contact_photo_size -->
- <dimen name="call_log_actions_left_padding">48dp</dimen>
+ <dimen name="call_log_actions_left_padding">64dp</dimen>
<!-- Text size for primary call log text -->
<dimen name="call_log_primary_text_size">16sp</dimen>
<!-- Text size for secondary call log text -->