Merge "Fix overdraw in Dialer"
diff --git a/res/drawable/background_all_contacts.xml b/res/drawable/background_all_contacts.xml
index 0d3703f..b7a059a 100644
--- a/res/drawable/background_all_contacts.xml
+++ b/res/drawable/background_all_contacts.xml
@@ -16,11 +16,6 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_pressed="false">
- <shape android:shape="rectangle" >
- <solid android:color="@color/all_contacts_button_color" />
- </shape>
- </item>
<item android:state_pressed="true">
<shape android:shape="rectangle" >
<solid android:color="@color/all_contacts_button_pressed_color" />
diff --git a/res/layout/call_log_fragment.xml b/res/layout/call_log_fragment.xml
index e58e160..aa8a185 100644
--- a/res/layout/call_log_fragment.xml
+++ b/res/layout/call_log_fragment.xml
@@ -20,7 +20,8 @@
android:layout_height="match_parent"
android:orientation="vertical"
android:divider="?android:attr/dividerHorizontal"
- android:showDividers="end">
+ android:showDividers="end"
+ android:background="@color/background_dialer_list_items">
<FrameLayout
android:id="@+id/voicemail_status"
@@ -65,7 +66,8 @@
android:layout_height="match_parent"
android:fadingEdge="none"
android:scrollbarStyle="outsideOverlay"
- android:divider="@null"
+ android:divider="@color/favorite_contacts_separator_color"
+ android:dividerHeight="1dp"
/>
<TextView android:id="@android:id/empty"
android:layout_width="match_parent"
diff --git a/res/layout/call_log_list_item.xml b/res/layout/call_log_list_item.xml
index e17dc27..a33ec7d 100644
--- a/res/layout/call_log_list_item.xml
+++ b/res/layout/call_log_list_item.xml
@@ -21,7 +21,6 @@
android:layout_height="wrap_content"
android:id="@+id/call_log_list_item"
android:orientation="vertical"
- android:background="@drawable/bottom_border_background"
>
<!--
This layout may represent either a call log item or one of the
diff --git a/res/layout/dialtacts_activity.xml b/res/layout/dialtacts_activity.xml
index 0f80564..2860886 100644
--- a/res/layout/dialtacts_activity.xml
+++ b/res/layout/dialtacts_activity.xml
@@ -21,6 +21,7 @@
android:orientation="vertical"
android:focusableInTouchMode="true"
android:clipChildren="false"
+ android:background="@color/background_dialer_light"
>
<FrameLayout
diff --git a/res/layout/phone_favorites_fragment.xml b/res/layout/phone_favorites_fragment.xml
index d1ff3d7..4992486 100644
--- a/res/layout/phone_favorites_fragment.xml
+++ b/res/layout/phone_favorites_fragment.xml
@@ -21,8 +21,7 @@
android:layout_height="match_parent"
android:divider="?android:attr/dividerHorizontal"
android:showDividers="end"
- android:clipChildren="false"
- android:background="@color/background_dialer_list_items">
+ android:clipChildren="false">
<FrameLayout
android:id="@+id/contact_tile_frame"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index e9730ea..b234bac 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -52,10 +52,10 @@
<color name="item_selected">#660099cc</color>
<!-- Background color of new dialer activity -->
- <color name="background_dialer_light">#eeeeee</color>
+ <color name="background_dialer_light">#ebebeb</color>
<!-- Background color of dialer list items (contacts, call log entries) -->
- <color name="background_dialer_list_items">#eeeeee</color>
+ <color name="background_dialer_list_items">#ebebeb</color>
<!-- Background color of action bars. Ensure this stays in sync with packages/Telephony
actionbar_background_color. -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 1025d0f..9302b95 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -104,7 +104,7 @@
</style>
<style name="CallDetailActivityTheme" parent="android:Theme.Holo.Light">
- <item name="android:windowBackground">@color/background_dialer_list_items</item>
+ <item name="android:windowBackground">@color/background_dialer_light</item>
<item name="android:gravity">top</item>
<item name="android:listViewStyle">@style/ListViewStyle</item>
<item name="android:actionBarStyle">@style/DialtactsActionBarStyle</item>
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index f302f29..363adda 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -298,6 +298,7 @@
fixIntent(intent);
setContentView(R.layout.dialtacts_activity);
+ getWindow().setBackgroundDrawable(null);
getActionBar().hide();
diff --git a/src/com/android/dialer/calllog/CallLogActivity.java b/src/com/android/dialer/calllog/CallLogActivity.java
index 42318f0..d1b3623 100644
--- a/src/com/android/dialer/calllog/CallLogActivity.java
+++ b/src/com/android/dialer/calllog/CallLogActivity.java
@@ -115,6 +115,7 @@
super.onCreate(savedInstanceState);
setContentView(R.layout.call_log_activity);
+ getWindow().setBackgroundDrawable(null);
final ActionBar actionBar = getActionBar();
actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);