poor man's Quantum UI

Change-Id: Iec4e6953ef3c780499af46462464b6a275fd6aa8

6 files changed, 149 insertions, 13 deletions

diff --git a/res/layout/conversation_message_attachment_bar.xml b/res/layout/conversation_message_attachment_bar.xml
index 4d587fa15..2e7da428d 100644
--- a/res/layout/conversation_message_attachment_bar.xml
+++ b/res/layout/conversation_message_attachment_bar.xml
@@ -70,7 +70,7 @@
 
         <ImageView
             android:id="@+id/overflow"
-            style="@android:style/Widget.Holo.Light.ActionButton.Overflow"
+            style="@style/OverflowButtonStyle"
             android:layout_width="48dip"
             android:layout_height="match_parent" />
 
@@ -92,4 +92,4 @@
         android:background="?android:attr/selectableItemBackground"
         android:focusable="true" />
 
-</com.android.mail.browse.MessageAttachmentBar>
\ No newline at end of file
+</com.android.mail.browse.MessageAttachmentBar>
diff --git a/res/values-land-v21/styles.xml b/res/values-land-v21/styles.xml
new file mode 100644
index 000000000..437a6ec6c
--- /dev/null
+++ b/res/values-land-v21/styles.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 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>
+    <!-- Spinner primary text is smaller than usual due to extra vertical padding in spinner asset -->
+    <style name="AccountSpinnerAnchorTextPrimary" parent="@android:style/TextAppearance.Quantum.Widget.ActionBar.Title">
+        <item name="android:textSize">14dp</item>
+    </style>
+</resources>
diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml
index 001f460f1..bae26ef2f 100644
--- a/res/values-land/styles.xml
+++ b/res/values-land/styles.xml
@@ -25,7 +25,7 @@
         <item name="android:background">@null</item>
     </style>
 
-    <style name="ComposeFieldLayout" parent="android:Widget.Holo.Light.EditText">
+    <style name="ComposeFieldLayout" parent="@style/ComposeFieldLayoutBase">
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:addStatesFromChildren">true</item>
diff --git a/res/values-sw600dp-v21/styles.xml b/res/values-sw600dp-v21/styles.xml
new file mode 100644
index 000000000..dd5580d9c
--- /dev/null
+++ b/res/values-sw600dp-v21/styles.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 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="AccountSpinnerAnchorTextPrimary" parent="@android:style/TextAppearance.Quantum.Widget.ActionBar.Title" />
+
+    <style name="ShortcutWidgetTheme" parent="@android:style/Theme.Quantum.Light.Dialog.MinWidth">
+        <item name="android:actionOverflowButtonStyle">@style/OverflowButtonStyle</item>
+    </style>
+</resources>
diff --git a/res/values-v21/styles.xml b/res/values-v21/styles.xml
new file mode 100644
index 000000000..fda77f285
--- /dev/null
+++ b/res/values-v21/styles.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 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="UnifiedEmailTheme" parent="@android:style/Theme.Quantum.Light.DarkActionBar">
+        <item name="android:actionDropDownStyle">@style/PlainSpinnerDropdown</item>
+        <item name="android:actionOverflowButtonStyle">@style/OverflowButtonStyle</item>
+        <item name="android:listViewWhiteStyle">@android:style/Widget.Quantum.Light.ListView</item>
+    </style>
+
+    <style name="OverflowButtonStyle"
+           parent="@android:style/Widget.Quantum.Light.ActionButton.Overflow" />
+
+    <style name="PlainSpinnerDropdown" parent="@android:style/Widget.Quantum.Light.Spinner">
+        <item name="android:background">@null</item>
+    </style>
+
+    <style name="PlainActionBarStyle" parent="@android:style/Widget.Quantum.Light.ActionBar.Solid">
+        <item name="android:displayOptions"></item>
+    </style>
+
+    <style name="WaitFragmentTitleBase" parent="@android:style/Widget.Quantum.TextView" />
+
+    <style name="AbstractNewMessageButtonStyleBase"
+        parent="@android:style/Widget.Quantum.Light.Button">
+    </style>
+
+    <style name="CustomActionButtonBase" parent="android:style/Widget.Quantum.Light.ActionButton" />
+
+    <style name="ComposeFieldLayoutBase" parent="android:Widget.Quantum.Light.EditText" />
+
+    <style name="AccountSpinnerAnchorTextPrimary" parent="@android:style/TextAppearance.Quantum.Widget.ActionBar.Title" />
+
+    <style name="AccountSpinnerAnchorTextSecondary" parent="@android:style/TextAppearance.Quantum.Widget.ActionBar.Subtitle" />
+
+    <style name="ConversationListFadeBase" parent="@android:style/Widget.Quantum.Light.ListView" />
+
+    <style name="MinTimeProgressViewStyle" parent="@android:style/Widget.Quantum.Light.ProgressBar" />
+
+    <style name="MinTimeProgressDialogStyleBase" parent="@android:style/Theme.Quantum.Light.Dialog" />
+
+    <style name="MessageButtonStyleBase" parent="android:Widget.Quantum.Button.Borderless" />
+
+    <style name="WidgetTitle" parent="@android:style/TextAppearance.Quantum.Widget.ActionBar.Title.Inverse">
+        <item name="android:singleLine">true</item>
+    </style>
+
+    <style name="WidgetSubtitle" parent="@android:style/TextAppearance.Quantum.Widget.ActionBar.Subtitle.Inverse">
+        <item name="android:singleLine">true</item>
+    </style>
+
+    <style name="ShortcutWidgetTheme" parent="@android:style/Theme.Quantum.Light.DialogWhenLarge">
+        <item name="android:actionOverflowButtonStyle">@style/OverflowButtonStyle</item>
+    </style>
+
+    <style name="ComposeThemeBase" parent="@style/UnifiedEmailTheme" />
+
+    <style name="AbstractVacationResponderDateSpinnerBase"
+           parent="android:style/Widget.Quantum.Light.Spinner" />
+</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 37f3704a5..9f44c7725 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -67,7 +67,9 @@
         <item name="android:layout_marginRight">@dimen/compose_recipient_heading_margin_end</item>
     </style>
 
-    <style name="ComposeFieldLayout" parent="android:Widget.Holo.Light.EditText">
+    <style name="ComposeFieldLayoutBase" parent="android:Widget.Holo.Light.EditText" />
+
+    <style name="ComposeFieldLayout" parent="@style/ComposeFieldLayoutBase">
         <item name="android:addStatesFromChildren">true</item>
         <item name="android:focusable">false</item>
         <item name="android:focusableInTouchMode">false</item>
@@ -171,7 +173,8 @@
     </style>
 
     <!-- Browse list item styles -->
-    <style name="ConversationListFade" parent="@android:style/Widget.Holo.Light.ListView">
+    <style name="ConversationListFadeBase" parent="@android:style/Widget.Holo.Light.ListView" />
+    <style name="ConversationListFade" parent="@style/ConversationListFadeBase">
         <item name="android:divider">@android:color/transparent</item>
         <item name="android:dividerHeight">0dip</item>
     </style>
@@ -197,7 +200,8 @@
 
     <style name="MinTimeProgressViewStyle" parent="@android:style/Widget.Holo.Light.ProgressBar" />
 
-    <style name="MinTimeProgressDialogStyle" parent="@android:style/Theme.Holo.Light.Dialog">
+    <style name="MinTimeProgressDialogStyleBase" parent="@android:style/Theme.Holo.Light.Dialog" />
+    <style name="MinTimeProgressDialogStyle" parent="@style/MinTimeProgressDialogStyleBase">
         <item name="android:windowAnimationStyle">@style/MinTimeAnimationStyle</item>
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowContentOverlay">@null</item>
@@ -297,13 +301,15 @@
         <item name="android:textIsSelectable">true</item>
     </style>
 
-    <style name="MessageHeaderActionButtonStyle" parent="android:Widget.Holo.Button.Borderless">
+    <style name="MessageButtonStyleBase" parent="android:Widget.Holo.Button.Borderless" />
+
+    <style name="MessageHeaderActionButtonStyle" parent="@style/MessageButtonStyleBase">
         <item name="android:layout_width">@dimen/message_header_action_button_width</item>
         <item name="android:layout_height">@dimen/message_header_action_button_height</item>
         <item name="android:scaleType">center</item>
     </style>
 
-    <style name="MessageAttachmentButtonBaseStyle" parent="@android:style/Widget.Holo.Button.Borderless">
+    <style name="MessageAttachmentButtonBaseStyle" parent="@style/MessageButtonStyleBase">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:minHeight">0dip</item>
         <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
@@ -379,7 +385,8 @@
         <item name="android:homeAsUpIndicator">@drawable/ic_up_holo_light</item>
     </style>
 
-    <style name="ComposeTheme" parent="@android:style/Theme.Holo.Light">
+    <style name="ComposeThemeBase" parent="@android:style/Theme.Holo.Light" />
+    <style name="ComposeTheme" parent="@style/ComposeThemeBase">
         <item name="android:actionOverflowButtonStyle">@style/OverflowButtonStyle</item>
         <item name="android:colorBackground">@android:color/white</item>
         <item name="android:colorBackgroundCacheHint">@android:color/white</item>
@@ -418,8 +425,9 @@
     <style name="VacationResponderTheme" parent="@style/UnifiedEmailTheme">
     </style>
 
+    <style name="WaitFragmentTitleBase" parent="@android:style/Widget.Holo.TextView" />
 
-    <style name="WaitFragmentTitle" parent="@android:style/Widget.Holo.TextView">
+    <style name="WaitFragmentTitle" parent="@style/WaitFragmentTitleBase">
         <item name="android:textAppearance">?android:attr/textAppearanceLarge</item>
         <item name="android:textColor">@android:color/black</item>
         <item name="android:layout_marginBottom">8dip</item>
@@ -523,7 +531,9 @@
         <item name="android:textColor">?android:attr/textColorLink</item>
     </style>
 
-    <style name="AbstractNewMessageButtonStyle" parent="@android:style/Widget.Holo.Light.Button">
+    <style name="AbstractNewMessageButtonStyleBase" parent="@android:style/Widget.Holo.Light.Button" />
+
+    <style name="AbstractNewMessageButtonStyle" parent="@style/AbstractNewMessageButtonStyleBase">
         <item name="android:layout_marginBottom">@dimen/toast_bar_margin</item>
         <item name="android:background">@drawable/new_message_toast_background</item>
         <item name="android:singleLine">true</item>
@@ -685,7 +695,9 @@
         <item name="android:layout_alignParentRight">true</item>
     </style>
 
-    <style name="CustomActionButton" parent="android:style/Widget.Holo.Light.ActionButton">
+    <style name="CustomActionButtonBase" parent="android:style/Widget.Holo.Light.ActionButton" />
+
+    <style name="CustomActionButton" parent="@style/CustomActionButtonBase">
         <item name="android:layout_height">match_parent</item>
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_weight">1</item>
@@ -715,8 +727,11 @@
         <item name="android:paddingRight">@dimen/vacation_responder_padding_horizontal</item>
     </style>
 
+    <style name="AbstractVacationResponderDateSpinnerBase"
+           parent="android:style/Widget.Holo.Light.Spinner" />
+
     <style name="AbstractVacationResponderDateSpinner"
-           parent="android:style/Widget.Holo.Light.Spinner">
+           parent="@style/AbstractVacationResponderDateSpinnerBase">
         <item name="android:textColor">@color/vacation_responder_spinner_text</item>
         <item name="android:textSize">16sp</item>
     </style>