From 05a96bdccdd04b9255e7b2c06ed286ed3c646471 Mon Sep 17 00:00:00 2001
From: Andrew Sapperstein <asapperstein@google.com>
Date: Thu, 31 Jul 2014 15:12:55 -0700
Subject: [PATCH] switch to appcompat. b/16664350

Change-Id: I3391bc352d6b9bc2d59ca6ac0088e88b1edcc76d
---
 Android.mk          | 6 ++++--
 AndroidManifest.xml | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Android.mk b/Android.mk
index 7dcbb4d34..a7dbba5f5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -20,6 +20,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 # Include res dir from chips, unified, emailcommon, and photoviewer
+appcompat_dir := ../../../prebuilts/sdk/current/support/v7/appcompat/res
 chips_dir := ../../../frameworks/opt/chips/res
 unified_email_dir := ../UnifiedEmail
 photo_dir := ../../../frameworks/opt/photoviewer/res ../../../frameworks/opt/photoviewer/activity/res
@@ -27,7 +28,7 @@ emailcommon_dir := emailcommon
 gridlayout_dir := ../../../prebuilts/sdk/current/support/v7/gridlayout/res
 bitmap_dir := ../../../frameworks/opt/bitmap/res
 datetimepicker_dir := ../../../frameworks/opt/datetimepicker/res
-res_dir := res $(unified_email_dir)/res $(chips_dir) $(photo_dir) $(emailcommon_dir)/res $(gridlayout_dir) $(bitmap_dir) $(datetimepicker_dir)
+res_dir := res $(unified_email_dir)/res $(chips_dir) $(photo_dir) $(emailcommon_dir)/res $(appcompat_dir) $(gridlayout_dir) $(bitmap_dir) $(datetimepicker_dir)
 
 LOCAL_MODULE_TAGS := optional
 
@@ -42,10 +43,11 @@ LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dir))
 LOCAL_ASSET_DIR := $(LOCAL_PATH)/$(unified_email_dir)/assets
 
 LOCAL_AAPT_FLAGS := --auto-add-overlay
-LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.chips:com.android.mail:com.android.email:com.android.emailcommon:com.android.ex.photo:android.support.v7.gridlayout:com.android.bitmap:com.android.datetimepicker
+LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.chips:com.android.mail:com.android.email:com.android.emailcommon:com.android.ex.photo:android.support.v7.appcompat:android.support.v7.gridlayout:com.android.bitmap:com.android.datetimepicker
 
 LOCAL_STATIC_JAVA_LIBRARIES := android-common com.android.emailcommon guava libchips libphotoviewer
 LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4
+LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-appcompat
 LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-gridlayout
 LOCAL_STATIC_JAVA_LIBRARIES += android-support-v13
 LOCAL_STATIC_JAVA_LIBRARIES += android-opt-bitmap
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b726cd147..621479608 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -224,7 +224,7 @@
         <activity
             android:label="@string/app_name"
             android:name="com.android.email2.ui.MailActivityEmail"
-            android:theme="@style/PlainUnifiedEmailTheme"
+            android:theme="@style/MailActivityTheme"
             android:windowSoftInputMode="adjustPan|stateUnspecified" >
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />