Fix search styling.
This eliminates the excessive padding on the left and makes the hint
text behave according to the new spec (since it uses the new action view
expanded mode).
A later CL will actually change the item to use the action view
facilities of the framework (so we don't have to manage our own custom
views).
Bug: 5109953
Change-Id: Ia3e4a1e64e65b3b8bb3e708b31636f4186acfd46
diff --git a/res/layout/action_bar_custom_view.xml b/res/layout/action_bar_custom_view.xml
index c97adb8..423b546 100644
--- a/res/layout/action_bar_custom_view.xml
+++ b/res/layout/action_bar_custom_view.xml
@@ -22,8 +22,7 @@
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="0dip"
- android:layout_height="0dip"
+ style="@style/action_bar_custom_view"
>
<include
android:id="@+id/account_spinner_container"
diff --git a/res/layout/action_bar_search.xml b/res/layout/action_bar_search.xml
index ec5801c..e2cd960 100644
--- a/res/layout/action_bar_search.xml
+++ b/res/layout/action_bar_search.xml
@@ -14,16 +14,11 @@
limitations under the License.
-->
-<FrameLayout
+<SearchView
xmlns:android="http://schemas.android.com/apk/res/android"
- style="@style/SearchBar"
- android:orientation="horizontal"
- >
- <SearchView
- android:id="@+id/search_view"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:iconifiedByDefault="false"
- />
-</FrameLayout>
+ android:id="@+id/search_view"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_gravity="center_vertical"
+ android:iconifiedByDefault="true"
+ />
diff --git a/res/layout/action_bar_spinner.xml b/res/layout/action_bar_spinner.xml
index cf13a48..d2ffa43 100644
--- a/res/layout/action_bar_spinner.xml
+++ b/res/layout/action_bar_spinner.xml
@@ -16,7 +16,8 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- style="@style/action_bar_spinner"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
android:orientation="horizontal"
>
<RelativeLayout
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index 41d4e28..1b2aadf 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -116,16 +116,11 @@
<item name="android:layout_alignParentRight">true</item>
</style>
- <style name="SearchBar">
+ <style name="action_bar_custom_view">
<item name="android:layout_width">420dip</item>
<item name="android:layout_height">match_parent</item>
</style>
- <style name="action_bar_spinner">
- <item name="android:layout_width">350dip</item>
- <item name="android:layout_height">match_parent</item>
- </style>
-
<style name="action_bar_spinner_primary_text">
<item name="android:includeFontPadding">false</item>
<item name="android:textSize">18sp</item>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 7700171..6d00ea8 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -126,7 +126,7 @@
<item name="android:singleLine">true</item>
</style>
- <style name="SearchBar">
+ <style name="action_bar_custom_view">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">match_parent</item>
</style>
@@ -169,11 +169,6 @@
<item name="android:ellipsize">end</item>
</style>
- <style name="action_bar_spinner">
- <item name="android:layout_width">match_parent</item>
- <item name="android:layout_height">match_parent</item>
- </style>
-
<style name="action_bar_spinner_primary_text">
<item name="android:textSize">16sp</item>
<item name="android:textColor">@color/text_primary_color</item>
diff --git a/src/com/android/email/activity/ActionBarController.java b/src/com/android/email/activity/ActionBarController.java
index 705ec19..4011255 100644
--- a/src/com/android/email/activity/ActionBarController.java
+++ b/src/com/android/email/activity/ActionBarController.java
@@ -206,13 +206,8 @@
mActionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_HOME | ActionBar.DISPLAY_SHOW_CUSTOM);
// Prepare the custom view
- final LayoutInflater inflater = LayoutInflater.from(mContext);
- mActionBarCustomView = (ViewGroup) inflater.inflate(R.layout.action_bar_custom_view, null);
- final ActionBar.LayoutParams customViewLayout = new ActionBar.LayoutParams(
- ActionBar.LayoutParams.WRAP_CONTENT,
- ActionBar.LayoutParams.MATCH_PARENT);
- customViewLayout.setMargins(0, 0, 0, 0);
- mActionBar.setCustomView(mActionBarCustomView, customViewLayout);
+ mActionBar.setCustomView(R.layout.action_bar_custom_view);
+ mActionBarCustomView = (ViewGroup) mActionBar.getCustomView();
// Account spinner
mAccountSpinnerContainer =
@@ -244,6 +239,7 @@
mSearchView = UiUtilities.getView(mSearchContainer, R.id.search_view);
mSearchView.setSubmitButtonEnabled(false);
mSearchView.setOnQueryTextListener(mOnQueryText);
+ mSearchView.onActionViewExpanded();
mActionBarCustomView.addView(mSearchContainer);
}
}