Merge "Toggle between elevation and 9-patch shadow in searchbox" into lmp-preview-dev
diff --git a/res/layout/call_log_list_item.xml b/res/layout/call_log_list_item.xml
index 31dcd88..9a90b24 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 3a93575..609f2a9 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/layout/show_all_contacts_fragment.xml b/res/layout/show_all_contacts_fragment.xml
index 6b89847..1de5ee5 100644
--- a/res/layout/show_all_contacts_fragment.xml
+++ b/res/layout/show_all_contacts_fragment.xml
@@ -38,10 +38,9 @@
android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginLeft="?attr/contact_browser_list_padding_left"
- android:layout_marginRight="?attr/contact_browser_list_padding_right"
android:layout_marginStart="?attr/contact_browser_list_padding_left"
android:layout_marginEnd="?attr/contact_browser_list_padding_right"
+ android:layout_marginTop="18dp"
android:fastScrollEnabled="true"
android:fadingEdge="none"
android:nestedScrollingEnabled="true" />
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 7318d92..adf0fda 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>