Merge "Fragments in Dialtacts report to Analytics." into lmp-dev
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 4884bd2..cba04bd 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -65,7 +65,7 @@
<dimen name="favorites_row_undo_text_side_padding">32dp</dimen>
<!-- Dimensions for most recent call shortcut cards -->
- <dimen name="recent_call_log_item_translation_z">1dp</dimen>
+ <dimen name="recent_call_log_item_translation_z">3dp</dimen>
<dimen name="recent_call_log_item_margin_horizontal">8dp</dimen>
<dimen name="recent_call_log_item_margin_top">4dp</dimen>
<dimen name="recent_call_log_item_margin_bottom">6dp</dimen>
@@ -87,6 +87,7 @@
room to the search box-->
<dimen name="action_bar_height">56dp</dimen>
<dimen name="action_bar_height_large">64dp</dimen>
+ <dimen name="action_bar_elevation">2dp</dimen>
<dimen name="tab_height">43dp</dimen>
<!-- actionbar height + tab height -->
<dimen name="actionbar_and_tab_height">107dp</dimen>
@@ -111,7 +112,7 @@
<!-- Size of the icon (voice search, close search) in the search box. -->
<dimen name="search_box_icon_size">28dp</dimen>
<dimen name="search_list_padding_top">16dp</dimen>
- <dimen name="search_box_elevation">2dp</dimen>
+ <dimen name="search_box_elevation">3dp</dimen>
<!-- Padding to the left and right of call log action buttons. -->
<dimen name="call_log_action_horizontal_padding">8dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 9f37d28..a3ef1c6 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -52,7 +52,7 @@
<item name="list_item_label_width_weight">3</item>
<item name="contact_browser_list_padding_left">0dp</item>
<item name="contact_browser_list_padding_right">0dp</item>
- <item name="contact_browser_background">@color/background_dialer_light</item>
+ <item name="contact_browser_background">@color/background_dialer_results</item>
<item name="list_item_name_text_color">@color/contact_list_name_text_color</item>
<item name="list_item_name_text_size">16sp</item>
<item name="list_item_text_indent">@dimen/contact_browser_list_item_text_indent</item>
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index 1e5b664..4cc11eb 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -354,6 +354,7 @@
actionBar.setCustomView(R.layout.search_edittext);
actionBar.setDisplayShowCustomEnabled(true);
actionBar.setBackgroundDrawable(null);
+ actionBar.setElevation(resources.getDimensionPixelSize(R.dimen.action_bar_elevation));
mActionBarController = new ActionBarController(this,
(SearchEditTextLayout) actionBar.getCustomView());
diff --git a/src/com/android/dialer/list/SearchFragment.java b/src/com/android/dialer/list/SearchFragment.java
index e2046e7..d993b23 100644
--- a/src/com/android/dialer/list/SearchFragment.java
+++ b/src/com/android/dialer/list/SearchFragment.java
@@ -99,6 +99,7 @@
final ListView listView = getListView();
+ listView.setBackgroundColor(res.getColor(R.color.background_dialer_results));
listView.setClipToPadding(false);
setVisibleScrollbarEnabled(false);
listView.setOnScrollListener(new OnScrollListener() {