Merge "Remove contacts tiles 9-patch from favorites tile view." into lmp-preview-dev
diff --git a/res/layout/call_log_activity.xml b/res/layout/call_log_activity.xml
index dfdf210..3b7609f 100644
--- a/res/layout/call_log_activity.xml
+++ b/res/layout/call_log_activity.xml
@@ -26,10 +26,11 @@
android:textAllCaps="true"
android:orientation="horizontal"
android:layout_gravity="top"
+ android:elevation="@dimen/tab_elevation"
style="@style/DialtactsActionBarTabTextStyle" />
<android.support.v4.view.ViewPager
android:id="@+id/call_log_pager"
android:layout_width="match_parent"
android:layout_height="0dp"
- android:layout_weight="1"/>
+ android:layout_weight="1" />
</LinearLayout>
diff --git a/res/layout/search_edittext.xml b/res/layout/search_edittext.xml
index ac31ea3..a07bfb8 100644
--- a/res/layout/search_edittext.xml
+++ b/res/layout/search_edittext.xml
@@ -82,7 +82,7 @@
android:layout_height="match_parent"
android:orientation="horizontal"
android:gravity="center_vertical"
- android:visibility="gone">
+ android:visibility="gone" >
<ImageButton
android:id="@+id/search_back_button"
@@ -113,7 +113,8 @@
android:src="@drawable/ic_close_dk"
android:clickable="true"
android:background="?android:attr/selectableItemBackground"
- android:contentDescription="@string/description_clear_search" />
+ android:contentDescription="@string/description_clear_search"
+ android:tint="@color/searchbox_icon_tint" />
</LinearLayout>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 5f45638..a5ad641 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -21,8 +21,6 @@
<color name="dialtacts_secondary_text_color">#888888</color>
<color name="dialer_accent_color">#eeff41</color>
- <color name="contact_list_background_color">#f2f2f2</color>
-
<!-- Color of the text describing an unconsumed missed call. -->
<color name="call_log_missed_call_highlight_color">#FF0000</color>
@@ -42,10 +40,9 @@
<color name="item_selected">#660099cc</color>
<!-- Background color of new dialer activity -->
- <color name="background_dialer_light">#ffffff</color>
-
+ <color name="background_dialer_light">#fbfbfb</color>
<!-- Background color of dialer list items (contacts, call log entries) -->
- <color name="background_dialer_list_items">#fbfbfb</color>
+ <color name="background_dialer_list_items">@color/background_dialer_light</color>
<color name="search_shortcut_background_color">#b6b6b6</color>
<color name="search_shortcut_icon_color">#f8f8f8</color>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 5b56dbe..96ebe90 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -53,7 +53,7 @@
<item name="list_item_label_width_weight">3</item>
<item name="contact_browser_list_padding_left">16dp</item>
<item name="contact_browser_list_padding_right">0dp</item>
- <item name="contact_browser_background">@color/contact_list_background_color</item>
+ <item name="contact_browser_background">@color/background_dialer_light</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>
@@ -123,7 +123,7 @@
<item name="android:height">@dimen/action_bar_height</item>
<!-- Empty icon -->
<item name="android:icon">@android:color/transparent</item>
- <item name="android:contentInsetStart">@dimen/search_margin_horizontal</item>
+ <item name="android:contentInsetStart">1px</item>
</style>
<style name="DialtactsActionBarWithoutTitleStyle" parent="DialtactsActionBarStyle">