Merge "Handle settings update case for data_set."
diff --git a/res/drawable/btn_call.xml b/res/drawable/btn_call.xml
index 82f08f4..51c2b7d 100644
--- a/res/drawable/btn_call.xml
+++ b/res/drawable/btn_call.xml
@@ -18,6 +18,8 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:drawable="@drawable/btn_call_pressed" />
+ <item android:state_focused="true"
+ android:drawable="@drawable/btn_dial_selected" />
<item
android:drawable="@android:color/transparent" />
</selector>
diff --git a/res/drawable/list_selector.xml b/res/drawable/list_selector.xml
deleted file mode 100644
index b43852c..0000000
--- a/res/drawable/list_selector.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<selector
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:exitFadeDuration="@android:integer/config_mediumAnimTime">
- <item
- android:state_window_focused="false"
- android:drawable="@android:color/transparent" />
- <item
- android:state_focused="true"
- android:state_pressed="true"
- android:drawable="@drawable/list_pressed_holo" />
- <item
- android:state_focused="false"
- android:state_pressed="true"
- android:drawable="@drawable/list_pressed_holo" />
- <item
- android:state_focused="true"
- android:drawable="@drawable/list_focused_holo" />
- <item
- android:drawable="@android:color/transparent" />
-</selector>
-
diff --git a/res/layout/call_log_list_item.xml b/res/layout/call_log_list_item.xml
index 649dede..e199ac2 100644
--- a/res/layout/call_log_list_item.xml
+++ b/res/layout/call_log_list_item.xml
@@ -84,7 +84,7 @@
android:paddingBottom="@dimen/call_log_inner_margin"
android:paddingRight="@dimen/call_log_outer_margin"
android:scaleType="center"
- android:background="@drawable/list_selector"
+ android:background="?android:attr/selectableItemBackground"
/>
</LinearLayout>
<LinearLayout
@@ -97,7 +97,7 @@
android:layout_centerVertical="true"
android:padding="@dimen/call_log_inner_margin"
android:orientation="vertical"
- android:background="@drawable/list_selector"
+ android:background="?android:attr/selectableItemBackground"
android:focusable="true"
>
<TextView
diff --git a/res/layout/call_log_voicemail_status.xml b/res/layout/call_log_voicemail_status.xml
index 7b59f6c..280dfd0 100644
--- a/res/layout/call_log_voicemail_status.xml
+++ b/res/layout/call_log_voicemail_status.xml
@@ -44,7 +44,7 @@
android:paddingLeft="@dimen/call_log_inner_margin"
android:paddingRight="@dimen/call_log_outer_margin"
android:textColor="?attr/call_log_voicemail_status_text_color"
- android:background="@drawable/list_selector"
+ android:background="?android:attr/selectableItemBackground"
android:clickable="true"
/>
</LinearLayout>