Merge "Changed color/font of view all contacts text. Removed whitespace. Added font family string to values and bolded text. Added do not translate to font string. Bug: 13936108"
diff --git a/res/drawable-hdpi/search_shadow.9.png b/res/drawable-hdpi/search_shadow.9.png
new file mode 100644
index 0000000..3dc1c17
--- /dev/null
+++ b/res/drawable-hdpi/search_shadow.9.png
Binary files differ
diff --git a/res/drawable-mdpi/search_shadow.9.png b/res/drawable-mdpi/search_shadow.9.png
new file mode 100644
index 0000000..0c33905
--- /dev/null
+++ b/res/drawable-mdpi/search_shadow.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/search_shadow.9.png b/res/drawable-xhdpi/search_shadow.9.png
new file mode 100644
index 0000000..5667ab3
--- /dev/null
+++ b/res/drawable-xhdpi/search_shadow.9.png
Binary files differ
diff --git a/res/drawable-xxhdpi/search_shadow.9.png b/res/drawable-xxhdpi/search_shadow.9.png
new file mode 100644
index 0000000..ff55620
--- /dev/null
+++ b/res/drawable-xxhdpi/search_shadow.9.png
Binary files differ
diff --git a/res/drawable/action_button_background.xml b/res/drawable/action_button_background.xml
index 40b47e3..fd5bc61 100644
--- a/res/drawable/action_button_background.xml
+++ b/res/drawable/action_button_background.xml
@@ -15,7 +15,7 @@
limitations under the License.
-->
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
- android:tint="?android:attr/colorButtonPressed"
+ android:tint="?android:attr/colorControlHighlight"
android:pinned="true">
<!-- Transparent background constrains the touch feedback ripple to the button, but also allows
touch feedback ripples in the parent to show under the button. -->
diff --git a/res/drawable/call_log_background.xml b/res/drawable/call_log_background.xml
index 166907a..c0c4889 100644
--- a/res/drawable/call_log_background.xml
+++ b/res/drawable/call_log_background.xml
@@ -15,5 +15,5 @@
limitations under the License.
-->
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
- android:tint="?android:attr/colorButtonPressed"
+ android:tint="?android:attr/colorControlHighlight"
android:pinned="false" />
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index c164294..8445ff7 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -323,6 +323,7 @@
final ActionBar actionBar = getActionBar();
actionBar.setCustomView(R.layout.search_edittext);
actionBar.setDisplayShowCustomEnabled(true);
+ actionBar.setBackgroundDrawable(null);
mSearchEditTextLayout = (SearchEditTextLayout) actionBar.getCustomView();
mSearchEditTextLayout.setPreImeKeyListener(mSearchEditTextLayoutListener);
diff --git a/src/com/android/dialer/widget/SearchEditTextLayout.java b/src/com/android/dialer/widget/SearchEditTextLayout.java
index 33bf09f..6830842 100644
--- a/src/com/android/dialer/widget/SearchEditTextLayout.java
+++ b/src/com/android/dialer/widget/SearchEditTextLayout.java
@@ -122,7 +122,7 @@
if (expand) {
AnimationUtils.crossFadeViews(mExpanded, mCollapsed, ANIMATION_DURATION);
animator = ValueAnimator.ofFloat(1f, 0f);
- setBackgroundColor(mBackgroundColor);
+ setBackgroundResource(R.drawable.search_shadow);
mSearchView.requestFocus();
} else {
AnimationUtils.crossFadeViews(mCollapsed, mExpanded, ANIMATION_DURATION);
