Make account spinner styles match gmail style.
Fixes b/5520685 update account switch spinner to match Gmail layout
Change-Id: I06c262f16d8629696bb761b005a3728406ccce53
diff --git a/res/layout/action_bar_spinner.xml b/res/layout/action_bar_spinner.xml
index 11c2fa8..35b8319 100644
--- a/res/layout/action_bar_spinner.xml
+++ b/res/layout/action_bar_spinner.xml
@@ -13,42 +13,53 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<LinearLayout
+<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
+ style="@style/AccountSwitchSpinnerItem"
android:layout_height="match_parent"
- android:orientation="horizontal"
- >
- <RelativeLayout
- android:id="@+id/account_spinner"
- style="?android:attr/actionDropDownStyle"
- android:layout_width="0dip"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:layout_centerVertical="true"
- android:paddingTop="0dip"
- android:paddingBottom="0dip"
- android:focusable="true"
- >
- <TextView
- android:id="@+id/spinner_line_1"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- style="@style/action_bar_spinner_primary_text"
- />
- <TextView
- android:id="@+id/spinner_line_2"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_below="@+id/spinner_line_1"
- style="@style/action_bar_spinner_secondary_text"
- />
- </RelativeLayout>
+ android:paddingLeft="0dip"
+ android:layout_marginLeft="0dip">
+
<TextView
android:id="@+id/spinner_count"
- style="@style/unreadCount"
- android:includeFontPadding="false"
- android:textStyle="normal"
- />
-</LinearLayout>
+ android:layout_alignParentRight="true"
+ android:layout_marginLeft="4dp"
+ style="@style/unreadCountActionBar" />
+
+ <!-- This spacer is here just to soak up horizontal space. -->
+ <!-- If this is omitted, the spinner triangle is too far from the text. -->
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_alignParentLeft="true"
+ android:layout_toLeftOf="@id/spinner_count">
+
+ <LinearLayout
+ android:id="@+id/account_spinner"
+ style="?android:attr/actionDropDownStyle"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:gravity="center_vertical">
+ <TextView
+ android:id="@+id/spinner_line_1"
+ style="@style/action_bar_spinner_primary_text"
+ android:singleLine="true"
+ android:ellipsize="end"
+ android:includeFontPadding="false"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+ <TextView
+ android:id="@+id/spinner_line_2"
+ style="@android:style/TextAppearance.Holo.Widget.ActionBar.Subtitle"
+ android:singleLine="true"
+ android:ellipsize="end"
+ android:includeFontPadding="false"
+ android:layout_marginRight="4dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+ </LinearLayout>
+
+ </FrameLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/action_bar_spinner_dropdown.xml b/res/layout/action_bar_spinner_dropdown.xml
index dc588f5..0b35098 100644
--- a/res/layout/action_bar_spinner_dropdown.xml
+++ b/res/layout/action_bar_spinner_dropdown.xml
@@ -18,46 +18,52 @@
The list items for the account spinner drop down.
Popup width is set at runtime from @dimen/account_spinner_dropdown_width
-->
-<RelativeLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ style="?android:attr/spinnerDropDownItemStyle"
+ android:layout_height="48dip"
android:layout_width="match_parent"
- android:layout_height="64dp"
- >
- <TextView
- android:id="@+id/unread_count"
- android:layout_alignParentRight="true"
- android:layout_centerVertical="true"
- style="@style/unreadCount"
- />
- <LinearLayout
+ android:gravity="center_vertical">
+
+ <RelativeLayout
android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:layout_marginLeft="16dp"
- android:layout_marginRight="16dp"
- android:orientation="vertical"
- android:layout_toLeftOf="@+id/unread_count"
- android:layout_alignParentLeft="true"
- android:layout_centerVertical="true"
- >
+ android:layout_width="0dip"
+ android:layout_weight="1">
<TextView
android:id="@+id/display_name"
- android:layout_width="match_parent"
+ android:singleLine="true"
android:layout_height="wrap_content"
- style="@style/action_bar_account_name"
- />
+ android:layout_width="match_parent"
+ android:ellipsize="end"
+ style="@android:style/TextAppearance.Holo.Widget.ActionBar.Title"/>
+
<TextView
android:id="@+id/email_address"
- android:layout_width="match_parent"
android:layout_height="wrap_content"
- style="@style/action_bar_account_name_secondary"
+ android:layout_width="match_parent"
+ android:ellipsize="end"
+ android:layout_below="@id/display_name"
+ android:layout_alignWithParentIfMissing="true"
+ android:layout_centerVertical="true"
+ style="@android:style/TextAppearance.Holo.Widget.ActionBar.Subtitle"/>
+
+ </RelativeLayout>
+ <RelativeLayout
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content">
+ <View
+ android:id="@+id/color_chip"
+ android:layout_width="32dip"
+ android:layout_height="6dip"
+ android:layout_marginBottom="2dip"
+ android:layout_alignParentTop="true"
+ android:layout_marginLeft="8dip"
+ android:background="@android:color/black"
/>
- </LinearLayout>
- <View
- android:id="@+id/color_chip"
- android:layout_width="32dip"
- android:layout_height="6dip"
- android:layout_alignParentTop="true"
- android:layout_marginLeft="8dip"
- android:visibility="gone"
- />
-</RelativeLayout>
+ <TextView
+ android:id="@+id/unread_count"
+ style="@style/unreadCount"
+ android:layout_centerVertical="true" />
+ </RelativeLayout>
+
+</LinearLayout>
+
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index 815749b..9f3d165 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -132,11 +132,6 @@
<item name="android:layout_alignParentRight">true</item>
</style>
- <style name="action_bar_custom_view">
- <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/src/com/android/email/activity/ActionBarController.java b/src/com/android/email/activity/ActionBarController.java
index f4cf33d..e009d83 100644
--- a/src/com/android/email/activity/ActionBarController.java
+++ b/src/com/android/email/activity/ActionBarController.java
@@ -550,7 +550,6 @@
private class AccountDropdownPopup extends ListPopupWindow {
public AccountDropdownPopup(Context context) {
super(context);
-
setAnchorView(mAccountSpinner);
setModal(true);
setPromptPosition(POSITION_PROMPT_ABOVE);