switch to appcompat. b/16664350

Currently only for MailActivity, ComposeActivity,
and FolderSelectionActivity.

Any activity that inherits from ActionBarActivity must
use an Appcompat-derived style. Three styles currently
exist: UnifiedEmail.Appcompat, UnifiedEmail.Appcompat.Toolbar,
and ShortcutWidgetTheme are all based on appcompat.

go/appcompat-material-doc contains the full migration guide.

The fast version is:
All MenuItem-related work that relates to actions must use
the MenuItemCompat-equivalent.
Any theming should use the appcompat versions which don't require
a namespace prefix. For instance, use actionBarStyle instead of
android:actionBarStyle.

There are a few missing styles on views that can't use appcompat versions.
Those still use style overrides for v21 changes. All others use appcompat versions.

A few methods on activity should now use the support equivalents:
getSupportActionBar()
supportInvalidateOptionsMenu()
startSupportActionMode()

Change-Id: Ic6f5964f4115ab4bde49c19df5fe49c9086df965

2 files changed, 34 insertions, 43 deletions

diff --git a/res/values/dimen.xml b/res/values/dimen.xml
index 4fe2a880f..b82799931 100644
--- a/res/values/dimen.xml
+++ b/res/values/dimen.xml
@@ -71,7 +71,6 @@
     <dimen name="message_header_contact_photo_margin">16dp</dimen>
     <dimen name="message_header_inner_side_padding">16dp</dimen>
     <dimen name="attachment_toast_yoffset">-100dip</dimen>
-    <dimen name="spinner_frame_width">196dip</dimen>
     <dimen name="floating_action_bar_margin">16dp</dimen>
     <dimen name="snack_bar_margin_horizontal">24dp</dimen>
     <dimen name="snack_bar_margin_vertical">14dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index ef9e0b6aa..d82a3618b 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -15,7 +15,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:app="http://schemas.android.com/apk/res-auto">
     <!-- Compose Styles -->
     <style name="RecipientEditTextViewStyle" parent="@style/RecipientEditTextView">
         <item name="android:layout_gravity">center_vertical</item>
@@ -197,12 +197,8 @@
         <item name="android:paddingRight">6dp</item>
     </style>
 
-    <!-- No change in the default case. -->
-    <style name="AccountSpinnerAnchorTextPrimary" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Title">
-    </style>
-
     <!-- Browse list item styles -->
-    <style name="ConversationListFadeBase" parent="@android:style/Widget.Holo.Light.ListView" />
+    <style name="ConversationListFadeBase" parent="android:Widget.Holo.Light.ListView" />
     <style name="ConversationListFade" parent="@style/ConversationListFadeBase">
         <item name="android:divider">@android:color/transparent</item>
         <item name="android:dividerHeight">0dip</item>
@@ -353,7 +349,7 @@
         <item name="android:textIsSelectable">true</item>
     </style>
 
-    <style name="MessageButtonStyleBase" parent="android:Widget.Holo.Button.Borderless" />
+    <style name="MessageButtonStyleBase" parent="@android:style/Widget.Holo.Button.Borderless" />
 
     <style name="MessageHeaderActionButtonStyle" parent="@style/MessageButtonStyleBase">
         <item name="android:layout_width">@dimen/message_header_action_button_width</item>
@@ -422,11 +418,11 @@
     </style>
 
     <!-- Widget styles -->
-    <style name="WidgetTitle" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Title.Inverse">
+    <style name="WidgetTitle" parent="@style/TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse">
         <item name="android:singleLine">true</item>
     </style>
 
-    <style name="WidgetSubtitle" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Subtitle.Inverse">
+    <style name="WidgetSubtitle" parent="@style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse">
         <item name="android:singleLine">true</item>
     </style>
 
@@ -439,44 +435,32 @@
         <item name="android:layout_marginTop">16dip</item>
     </style>
 
-    <style name="ShortcutWidgetTheme" parent="@android:style/Theme.Holo.Light.DialogWhenLarge">
-        <item name="android:actionOverflowButtonStyle">@style/ActionBarOverflowButtonStyle</item>
-        <item name="android:actionBarStyle">@style/ActionBarStyle</item>
-        <item name="android:actionModeBackground">@color/action_mode_background</item>
-        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back_wht_24dp</item>
-    </style>
-
-    <style name="ComposeThemeBase" parent="@android:style/Theme.Holo.Light.DarkActionBar">
-        <item name="android:homeAsUpIndicator">@drawable/ic_close_wht_24dp</item>
-    </style>
+    <style name="ShortcutWidgetTheme" parent="@style/UnifiedEmailTheme.Appcompat" />
 
-    <style name="ComposeTheme" parent="@style/ComposeThemeBase">
-        <item name="android:actionOverflowButtonStyle">@style/ActionBarOverflowButtonStyle</item>
+    <style name="ComposeTheme" parent="@style/UnifiedEmailTheme.Appcompat">
         <item name="android:colorBackground">@android:color/white</item>
         <item name="android:colorBackgroundCacheHint">@android:color/white</item>
         <item name="android:windowBackground">@android:color/white</item>
-        <item name="android:actionBarStyle">@style/ActionBarStyle</item>
-        <item name="android:actionModeBackground">@color/action_mode_background</item>
     </style>
 
     <style name="InvisibleShortcutWidgetTheme" parent="@style/ShortcutWidgetTheme">
         <item name="android:windowNoDisplay">true</item>
     </style>
 
-    <style name="PlainActionBarStyle" parent="ActionBarStyle">
-        <item name="android:displayOptions" />
+    <style name="OverflowButtonStyle" parent="@style/Widget.AppCompat.ActionButton.Overflow">
+        <item name="android:src">@drawable/ic_overflow_24dp</item>
     </style>
 
-    <style name="ActionBarStyle"  parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse">
-        <item name="android:background">@color/actionbar_color</item>
+    <style name="ActionBarOverflowButtonStyle" parent="@android:style/Widget.Holo.ActionButton.Overflow">
+        <item name="android:src">@drawable/ic_menu_moreoverflow_mtrl_alpha</item>
     </style>
 
-    <style name="OverflowButtonStyle" parent="@android:style/Widget.Holo.ActionButton.Overflow">
-        <item name="android:src">@drawable/ic_overflow_24dp</item>
+    <style name="ActionBarOverflowButtonStyle.Appcompat" parent="@style/Widget.AppCompat.ActionButton.Overflow">
+        <item name="android:src">@drawable/ic_menu_moreoverflow_mtrl_alpha</item>
     </style>
 
-    <style name="ActionBarOverflowButtonStyle" parent="@android:style/Widget.Holo.ActionButton.Overflow">
-        <item name="android:src">@drawable/ic_menu_moreoverflow_mtrl_alpha</item>
+    <style name="ActionBarStyle"  parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse">
+        <item name="android:background">@color/actionbar_color</item>
     </style>
 
     <style name="UnifiedEmailTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar">
@@ -487,11 +471,24 @@
         <item name="android:listViewWhiteStyle">@android:style/Widget.Holo.Light.ListView</item>
     </style>
 
-    <style name="PlainUnifiedEmailTheme" parent="@style/UnifiedEmailTheme">
-        <item name="android:actionBarStyle">@style/PlainActionBarStyle</item>
-        <item name="android:actionModeBackground">@color/action_mode_background</item>
+
+    <style name="UnifiedEmailTheme.Appcompat" parent="@style/Theme.AppCompat.Light.DarkActionBar">
+        <item name="actionModeBackground">@color/action_mode_background</item>
+        <item name="actionOverflowButtonStyle">@style/ActionBarOverflowButtonStyle.Appcompat</item>
+        <item name="colorPrimary">@color/actionbar_color</item>
+        <!-- Used by the StatusBar and NavBar (currently broken?) -->
+        <item name="colorPrimaryDark">@color/statusbar_color</item>
+        <item name="colorAccent">@color/accent_blue</item>
+        <item name="homeAsUpIndicator">@drawable/ic_arrow_back_wht_24dp</item>
+    </style>
+
+    <style name="UnifiedEmailTheme.Appcompat.Toolbar" parent="@style/UnifiedEmailTheme.Appcompat">
+        <item name="android:windowNoTitle">true</item>
+        <item name="windowActionBar">false</item>
     </style>
 
+    <style name="MailActivityTheme" parent="@style/UnifiedEmailTheme.Appcompat.Toolbar" />
+
     <style name="VacationResponderTheme" parent="@style/UnifiedEmailTheme">
     </style>
 
@@ -510,12 +507,7 @@
     <style name="NotificationSecondaryText">
     </style>
 
-    <style name="TwoPaneConversationList">
-    </style>
-
-    <style name="AccountSpinnerStyle">
-        <item name="android:layout_width">wrap_content</item>
-    </style>
+    <style name="TwoPaneConversationList" />
 
     <style name="AttachmentButtonStyle">
         <item name="android:clickable">true</item>
@@ -708,7 +700,7 @@
         <item name="android:layout_alignParentRight">true</item>
     </style>
 
-    <style name="CustomActionButtonBase" parent="android:style/Widget.Holo.Light.ActionButton" />
+    <style name="CustomActionButtonBase" parent="@style/Widget.AppCompat.Light.ActionButton" />
 
     <style name="CustomActionButton" parent="@style/CustomActionButtonBase">
         <item name="android:layout_height">match_parent</item>
@@ -741,7 +733,7 @@
     </style>
 
     <style name="AbstractVacationResponderDateSpinnerBase"
-           parent="android:style/Widget.Holo.Light.Spinner" />
+           parent="android:Widget.Holo.Light.Spinner" />
 
     <style name="AbstractVacationResponderDateSpinner"
            parent="@style/AbstractVacationResponderDateSpinnerBase">