Merge "Fix action bar text styles."

res/layout/action_bar_spinner.xml

@@ -14,50 +14,42 @@
      limitations under the License.
 -->
 
-<LinearLayout
+<RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="@dimen/account_spinner_width"
     android:layout_height="match_parent"
-    android:layout_gravity="center_vertical"
-    android:orientation="horizontal"
     style="@android:style/Widget.Holo.Spinner"
     >
-    <LinearLayout
-        android:layout_width="0dip"
-        android:layout_weight="1"
-        android:layout_height="match_parent"
-        android:layout_gravity="center_vertical"
-        android:orientation="vertical"
-        >
-        <TextView
-            android:id="@+id/spinner_line_1"
-            android:layout_width="match_parent"
-            android:layout_height="0dip"
-            android:layout_weight="1"
-            android:textSize="16dip"
-            android:textColor="@color/text_primary_color"
-            android:singleLine="true"
-            android:ellipsize="end"
-            android:gravity="center_vertical"
-            />
-        <TextView
-            android:id="@+id/spinner_line_2"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textSize="12dip"
-            android:textColor="@color/text_primary_color"
-            android:singleLine="true"
-            android:ellipsize="end"
-            android:gravity="center_vertical"
-            />
-    </LinearLayout>
     <TextView
         android:id="@+id/spinner_count"
         style="@style/action_bar_unread_count"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_alignParentRight="true"
+        android:includeFontPadding="false"
         android:singleLine="true"
         android:ellipsize="none"
         android:gravity="center"
         />
-</LinearLayout>
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toLeftOf="@+id/spinner_count"
+        android:layout_alignParentLeft="true"
+        android:layout_centerVertical="true"
+        >
+        <TextView
+            android:id="@+id/spinner_line_1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            style="@style/action_bar_spinner_primary_text"
+            />
+        <TextView
+            android:id="@+id/spinner_line_2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/spinner_line_1"
+            style="@style/action_bar_spinner_secondary_text"
+            />
+    </RelativeLayout>
+</RelativeLayout>

res/values-land/styles.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <style name="action_bar_unread_count">
+        <item name="android:includeFontPadding">false</item>
+        <item name="android:textSize">30sp</item>
+        <item name="android:textColor">@color/text_ternary_color</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:ellipsize">end</item>
+    </style>
+
+    <style name="action_bar_spinner_primary_text">
+        <item name="android:includeFontPadding">false</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:textColor">@color/text_primary_color</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:ellipsize">end</item>
+    </style>
+
+    <style name="action_bar_spinner_secondary_text">
+        <item name="android:includeFontPadding">false</item>
+        <item name="android:textSize">12sp</item>
+        <item name="android:textColor">@color/text_primary_color</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:ellipsize">end</item>
+    </style>
+</resources>

res/values-sw600dp/styles.xml

@@ -123,4 +123,16 @@
         <item name="android:layout_width">420dip</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>
+        <item name="android:textColor">@color/text_primary_color</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:ellipsize">end</item>
+    </style>
+
+    <style name="action_bar_spinner_secondary_text">
+        <item name="android:visibility">gone</item>
+    </style>
 </resources>

res/values/styles.xml

@@ -160,6 +160,20 @@
         <item name="android:ellipsize">end</item>
     </style>
 
+    <style name="action_bar_spinner_primary_text">
+        <item name="android:textSize">16sp</item>
+        <item name="android:textColor">@color/text_primary_color</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:ellipsize">end</item>
+    </style>
+
+    <style name="action_bar_spinner_secondary_text">
+        <item name="android:textSize">12sp</item>
+        <item name="android:textColor">@color/text_primary_color</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:ellipsize">end</item>
+    </style>
+
     <style name="search_header">
         <item name="android:layout_height">32dip</item>
         <item name="android:layout_width">match_parent</item>