diff options
| author | Andrew Lee <anwlee@google.com> | 2014-05-30 20:51:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-30 20:51:19 +0000 |
| commit | 988e60e77519429b20ead6d27938369e75084f1e (patch) | |
| tree | c86d2141151f33594040724536fa2e35eeb80223 | |
| parent | dd2e5b14e956ea43d82d70ed9a4c3cab6497b70d (diff) | |
| parent | d3ca6c249f1fbece6d3f58598413b076c744e757 (diff) | |
Merge "Matching recents to redlines." into lmp-preview-dev
| -rw-r--r-- | res/layout/call_log_list_item.xml | 2 | ||||
| -rw-r--r-- | res/layout/call_log_list_item_actions.xml | 12 | ||||
| -rw-r--r-- | res/values/dimens.xml | 8 |
3 files changed, 10 insertions, 12 deletions
diff --git a/res/layout/call_log_list_item.xml b/res/layout/call_log_list_item.xml index 31dcd88f4..9a90b245a 100644 --- a/res/layout/call_log_list_item.xml +++ b/res/layout/call_log_list_item.xml @@ -33,7 +33,7 @@ android:textColor="?attr/call_log_secondary_text_color" android:textSize="@dimen/call_log_secondary_text_size" android:paddingTop="@dimen/call_log_day_group_padding" - android:paddingBottom="0dp" + android:paddingBottom="1dp" /> <!-- Linear layout to separate the primary area containing the contact badge and caller diff --git a/res/layout/call_log_list_item_actions.xml b/res/layout/call_log_list_item_actions.xml index 3a93575c1..609f2a98d 100644 --- a/res/layout/call_log_list_item_actions.xml +++ b/res/layout/call_log_list_item_actions.xml @@ -31,7 +31,6 @@ <TextView android:id="@+id/call_back_action" android:background="@drawable/action_button_background" - android:fontFamily="sans-serif-medium" android:gravity="center" android:layout_width="wrap_content" android:layout_height="match_parent" @@ -39,7 +38,8 @@ 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" + android:textSize="@dimen/call_log_list_item_actions_text_size" + android:textStyle="bold" android:nextFocusLeft="@+id/primary_action_view" android:nextFocusRight="@+id/voicemail_action" android:focusable="true" @@ -47,7 +47,6 @@ <TextView android:id="@+id/voicemail_action" android:background="@drawable/action_button_background" - android:fontFamily="sans-serif-medium" android:gravity="center" android:layout_width="wrap_content" android:layout_height="match_parent" @@ -55,7 +54,8 @@ 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" + android:textSize="@dimen/call_log_list_item_actions_text_size" + android:textStyle="bold" android:nextFocusLeft="@+id/call_back_action" android:nextFocusRight="@+id/details_action" android:focusable="true" @@ -63,7 +63,6 @@ <TextView android:id="@+id/details_action" android:background="@drawable/action_button_background" - android:fontFamily="sans-serif-medium" android:gravity="center" android:layout_width="wrap_content" android:layout_height="match_parent" @@ -71,7 +70,8 @@ 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" + android:textSize="@dimen/call_log_list_item_actions_text_size" + android:textStyle="bold" android:nextFocusLeft="@+id/voicemail_action" android:nextFocusRight="@+id/primary_action_view" android:focusable="true" diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 7318d92e8..adf0fda42 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -130,16 +130,14 @@ call_log_action_horizontal_padding call_log_list_contact_photo_size --> <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 --> <dimen name="call_log_secondary_text_size">14sp</dimen> + <dimen name="call_log_list_item_actions_text_size">12sp</dimen> <!-- Height of the call log actions section for each call log entry --> - <dimen name="call_log_action_height">48dp</dimen> + <dimen name="call_log_action_height">44dp</dimen> <!-- Z Translation of expanded call log items. --> <dimen name="call_log_expanded_translation_z">4dp</dimen> - <!-- Padding above call log day group headers. --> - <dimen name="call_log_day_group_padding">16dp</dimen> + <dimen name="call_log_day_group_padding">15dp</dimen> <!-- Size of icon for contacts number shortcuts --> <dimen name="search_shortcut_radius">40dp</dimen> |