From dbd2aeda76abe27b42a480d7a0b5f9d6b87ed829 Mon Sep 17 00:00:00 2001
From: Ben Komalo <benkomalo@google.com>
Date: Fri, 7 Oct 2011 15:02:02 -0700
Subject: [PATCH] Fix up compose styles.

- make subject text have the proper text flags
- remove unneeded v13 overlay, and fix the main style to not have
DarkActionBar (which is wrong)

Bug: 5430026
Change-Id: I44d72f89118f03be89ed3ea1a5516321798d9fa1
---
 res/layout-v14/compose_subject.xml |  4 +++-
 res/values-v13/styles.xml          | 21 ---------------------
 res/values/styles.xml              |  2 +-
 3 files changed, 4 insertions(+), 23 deletions(-)
 delete mode 100644 res/values-v13/styles.xml

diff --git a/res/layout-v14/compose_subject.xml b/res/layout-v14/compose_subject.xml
index a5b5d4d8f..bf9e2d861 100644
--- a/res/layout-v14/compose_subject.xml
+++ b/res/layout-v14/compose_subject.xml
@@ -15,9 +15,11 @@
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     style="@style/ComposeFieldLayout">
+    <!-- TODO: consolidate this style with ComposeSubjectStyle -->
     <EditText android:id="@+id/subject"
         style="@style/EmailComposeEditTextView"
         android:hint="@string/message_compose_subject_hint"
+        android:inputType="textEmailSubject|textAutoCorrect|textCapSentences|textMultiLine"
         android:textColorHint="@color/compose_label_text"
         />
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/res/values-v13/styles.xml b/res/values-v13/styles.xml
deleted file mode 100644
index e4a176774..000000000
--- a/res/values-v13/styles.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-
-<!-- See also values-xlarge for specializations for xlarge screens -->
-<resources>
-    <style name="EmailTheme" parent="@android:style/Theme.Holo.Light">
-    </style>
-</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 2ab7bcb67..dfdea27bd 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -16,7 +16,7 @@
 
 <!-- non-xlarge.  See also values-xlarge for specializations for xlarge screens -->
 <resources>
-    <style name="EmailTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar">
+    <style name="EmailTheme" parent="@android:style/Theme.Holo.Light">
     </style>
 
     <style name="unreadCount">