Fix unread layout for the tablet.
Change-Id: Ic29eec7badc13c871b62bc5e6f73cd0c93c92c52
diff --git a/res/layout-sw600dp/account_switch_spinner_item.xml b/res/layout-sw600dp/account_switch_spinner_item.xml
index 3207615..b0cbab7 100644
--- a/res/layout-sw600dp/account_switch_spinner_item.xml
+++ b/res/layout-sw600dp/account_switch_spinner_item.xml
@@ -17,49 +17,41 @@
-->
<!-- style="@style/AccountSwitchSpinnerItem" -->
-<LinearLayout
+<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="match_parent"
android:layout_width="match_parent"
android:paddingLeft="0dip"
android:layout_marginLeft="0dip">
- <!-- 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:id="@+id/spinner_frame"
+ <LinearLayout
+ android:id="@+id/spinner"
android:layout_width="@dimen/spinner_frame_width"
android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:gravity="center_vertical"
+ android:background="@drawable/spinner_ab_holo_light"
android:layout_alignParentLeft="true">
-
- <LinearLayout
- android:id="@+id/spinner"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- android:gravity="center_vertical"
- android:background="@drawable/spinner_ab_holo_light">
- <TextView
- android:id="@+id/account_spinner_folder"
- style="@android:style/TextAppearance.Holo.Widget.ActionBar.Title.Inverse"
- android:singleLine="true"
- android:ellipsize="end"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content" />
- <TextView
- android:id="@+id/account_spinner_account_name"
- style="@android:style/TextAppearance.Holo.Widget.ActionBar.Subtitle.Inverse"
- android:singleLine="true"
- android:ellipsize="end"
- android:layout_marginRight="4dp"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content" />
- </LinearLayout>
-
- </FrameLayout>
+ <TextView
+ android:id="@+id/account_spinner_folder"
+ style="@android:style/TextAppearance.Holo.Widget.ActionBar.Title.Inverse"
+ android:singleLine="true"
+ android:ellipsize="end"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+ <TextView
+ android:id="@+id/account_spinner_account_name"
+ style="@android:style/TextAppearance.Holo.Widget.ActionBar.Subtitle.Inverse"
+ android:singleLine="true"
+ android:ellipsize="end"
+ android:layout_marginRight="4dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+ </LinearLayout>
<TextView
android:id="@+id/unread"
- style="@style/unreadCountActionBarTablet" />
-
-</LinearLayout>
+ android:layout_marginLeft="4dp"
+ style="@style/UnreadCountActionBar"
+ android:layout_toRightOf="@id/spinner" />
+</RelativeLayout>