Use new assets for green box in voice title bar.
The new assets have a better margin to match the other
search field textfields. Also update title_voice.xml to use a
pressed state that matches the new assets. In TitleBar.java,
do not clear out the vertical padding in voice search mode.
Bug 2566133
Change-Id: Icb15d0660d2f06363e66adbdd92537e34b90b64e
diff --git a/res/drawable-hdpi/textfield_voice_search.9.png b/res/drawable-hdpi/textfield_voice_search.9.png
index d988493..5d3f281 100644
--- a/res/drawable-hdpi/textfield_voice_search.9.png
+++ b/res/drawable-hdpi/textfield_voice_search.9.png
Binary files differ
diff --git a/res/drawable-mdpi/textfield_voice_search.9.png b/res/drawable-mdpi/textfield_voice_search.9.png
index 5cf6592..e7baba0 100644
--- a/res/drawable-mdpi/textfield_voice_search.9.png
+++ b/res/drawable-mdpi/textfield_voice_search.9.png
Binary files differ
diff --git a/res/drawable/title_voice.xml b/res/drawable/title_voice.xml
index 0bb1ad3..e96eb94 100644
--- a/res/drawable/title_voice.xml
+++ b/res/drawable/title_voice.xml
@@ -16,7 +16,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
- android:drawable="@*android:drawable/textfield_pressed" />
+ android:drawable="@*android:drawable/textfield_search_empty_pressed" />
<item android:state_pressed="false"
android:drawable="@drawable/textfield_voice_search" />
</selector>
diff --git a/src/com/android/browser/TitleBar.java b/src/com/android/browser/TitleBar.java
index 2c25534..fc39f36 100644
--- a/src/com/android/browser/TitleBar.java
+++ b/src/com/android/browser/TitleBar.java
@@ -280,6 +280,9 @@
mTitle.setEllipsize(null);
mRtButton.setVisibility(View.VISIBLE);
mStopButton.setVisibility(View.GONE);
+ mTitleBg.setBackgroundDrawable(titleDrawable);
+ mTitleBg.setPadding(mLeftMargin, getPaddingTop(), mRightMargin,
+ getPaddingBottom());
} else {
if (mInLoad) {
titleDrawable = mLoadingBackground;
@@ -292,10 +295,10 @@
mRtButton.setImageDrawable(mBookmarkDrawable);
}
mTitle.setEllipsize(TextUtils.TruncateAt.END);
+ mTitleBg.setBackgroundDrawable(titleDrawable);
+ mTitleBg.setPadding(mLeftMargin, 0, mRightMargin, 0);
}
mTitle.setSingleLine(!mInVoiceMode);
- mTitleBg.setBackgroundDrawable(titleDrawable);
- mTitleBg.setPadding(mLeftMargin, 0, mRightMargin, 0);
}
/**
