Share unreadCountTablet styles with gmail.

Also, share spinner width
Part of fix for b/6476990 Compose icon overlaps the unread message count in Portrait mode

Change-Id: I52cbeae67dbdafb8122ed3a8c2be9447ed1ec0cf

6 files changed, 65 insertions, 2 deletions

diff --git a/res/values-sw600dp-port/styles.xml b/res/values-sw600dp-port/styles.xml
index 0fca1f3..b0599a5 100644
--- a/res/values-sw600dp-port/styles.xml
+++ b/res/values-sw600dp-port/styles.xml
@@ -26,4 +26,9 @@
     <style name="ComposeButtonColumn">
         <item name="android:minWidth">76dip</item>
     </style>
+
+    <style name="unreadCountActionBarTablet" parent="@style/unreadCountActionBar">
+        <item name="android:layout_marginLeft">12dp</item>
+        <item name="android:layout_width">wrap_content</item>
+    </style>
 </resources>
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index 2f960da..2c7f3fd 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -84,4 +84,9 @@
 
     <style name="AccountSpinnerAnchorTextPrimary" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Title">
     </style>
+
+    <style name="unreadCountActionBarTablet" parent="@style/unreadCountActionBar">
+        <item name="android:layout_marginLeft">8dp</item>
+        <item name="android:layout_width">wrap_content</item>
+    </style>
 </resources>
diff --git a/res/values-sw720dp-port/dimen.xml b/res/values-sw720dp-port/dimen.xml
new file mode 100644
index 0000000..0e18368
--- /dev/null
+++ b/res/values-sw720dp-port/dimen.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2011 Google Inc.
+ * Licensed to 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>
+    <dimen name="spinner_frame_width">200dip</dimen>
+</resources>
\ No newline at end of file
diff --git a/res/values-sw700dp/styles.xml b/res/values-sw720dp/dimen.xml
index 2a3b5ee..fed6239 100644
--- a/res/values-sw700dp/styles.xml
+++ b/res/values-sw720dp/dimen.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 /*
- * Copyright (C) 2012 Google Inc.
+ * Copyright (C) 2011 Google Inc.
  * Licensed to The Android Open Source Project.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,4 +21,5 @@
     <style name="ComposeButtonColumn">
         <item name="android:minWidth">100dip</item>
     </style>
-</resources>
+    <dimen name="spinner_frame_width">232dip</dimen>
+</resources>
\ No newline at end of file
diff --git a/res/values-sw720dp/styles.xml b/res/values-sw720dp/styles.xml
new file mode 100644
index 0000000..b12f5d4
--- /dev/null
+++ b/res/values-sw720dp/styles.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2012 Google Inc.
+ * Licensed to 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="ComposeButtonColumn">
+        <item name="android:minWidth">100dip</item>
+    </style>
+    <style name="unreadCountActionBarTablet" parent="@style/unreadCountActionBar">
+        <item name="android:layout_marginLeft">16dp</item>
+        <item name="android:layout_width">wrap_content</item>
+    </style>
+</resources>
diff --git a/res/values/dimen.xml b/res/values/dimen.xml
index b18c649..9d637fd 100644
--- a/res/values/dimen.xml
+++ b/res/values/dimen.xml
@@ -25,4 +25,5 @@
     <dimen name="date_font_size">12sp</dimen>
     <dimen name="account_dropdown_dropdownwidth">274dip</dimen>
     <dimen name="actionbar_subject_padding_right">8dp</dimen>
+    <dimen name="spinner_frame_width">168dip</dimen>
 </resources>