From 27348c78829439f14da4d4275794913ea22eb592 Mon Sep 17 00:00:00 2001
From: Ben Komalo <benkomalo@google.com>
Date: Wed, 17 Aug 2011 11:12:00 -0700
Subject: [PATCH] Revert "Make compose landscape(phone) go fullscreen"

This reverts commit 0108aeb5b13fa8a289c42bc70fac1bebac0e9746.

There are too many issues that crop up in this mode.

Bug: 5121640
Change-Id: I6264a63cada973a7ee327ff4c7e7af5df5a6fdb3
---
 AndroidManifest.xml                | 2 +-
 res/values-land/styles.xml         | 4 ----
 res/values-sw600dp-land/styles.xml | 3 ---
 res/values/styles.xml              | 6 ------
 4 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0547fbf94..ffbfe86ec 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -223,7 +223,7 @@
             android:name=".activity.MessageCompose"
             android:label="@string/compose_title"
             android:enabled="false"
-            android:theme="@style/MessageComposeTheme"
+            android:theme="@android:style/Theme.Holo.Light"
             >
             <intent-filter>
                 <action
diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml
index 7a2f0b5d3..e9f9ada9f 100644
--- a/res/values-land/styles.xml
+++ b/res/values-land/styles.xml
@@ -15,10 +15,6 @@
 -->
 
 <resources>
-    <style name="MessageComposeTheme" parent="EmailTheme">
-        <item name="android:windowFullscreen">true</item>
-    </style>
-
     <style name="action_bar_unread_count">
         <item name="android:includeFontPadding">false</item>
         <item name="android:textSize">30sp</item>
diff --git a/res/values-sw600dp-land/styles.xml b/res/values-sw600dp-land/styles.xml
index 266d0e67a..344960b4a 100644
--- a/res/values-sw600dp-land/styles.xml
+++ b/res/values-sw600dp-land/styles.xml
@@ -17,9 +17,6 @@
 <!-- tablet, landscape -->
 
 <resources>
-    <style name="MessageComposeTheme" parent="EmailTheme">
-    </style>
-
     <!-- Use fixed width in landscape -->
     <style name="message_compose_scroll">
         <item name="android:layout_width">800dip</item>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 5ef090642..ff6c2f2e0 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -16,15 +16,9 @@
 
 <!-- non-xlarge.  See also values-xlarge for specializations for xlarge screens -->
 <resources>
-    <!-- Default theme for all Activity's in the app, unless otherwise
-         overridden and specified -->
     <style name="EmailTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar">
     </style>
 
-    <style name="MessageComposeTheme" parent="EmailTheme">
-        <!-- This gets changed in some other views -->
-    </style>
-
     <style name="unreadCount">
         <item name="android:ellipsize">end</item>
         <item name="android:singleLine">true</item>