From 938bb4a4d50114eb741a128f7a75d50f1af55869 Mon Sep 17 00:00:00 2001
From: Mikhail Naganov <mnaganov@google.com>
Date: Fri, 27 Jun 2014 12:56:17 +0000
Subject: [PATCH] Revert "Use Settings app's theme for L and later"

This reverts commit 80c47b2f7961a5a8de1c6ec5751c04d15d42122a.

Change-Id: I69619bd9856d4133794597a0cf81cc121e3a7887
---
 java/Android.mk                                  |  4 ----
 java/AndroidManifest.xml                         |  8 ++++----
 .../values-v20}/platform-theme.xml               | 16 ++--------------
 java/res/values/platform-theme.xml               |  1 -
 4 files changed, 6 insertions(+), 23 deletions(-)
 rename java/{res-lxx/values-v21 => res/values-v20}/platform-theme.xml (51%)

diff --git a/java/Android.mk b/java/Android.mk
index 0a7b21f01..b580624d7 100644
--- a/java/Android.mk
+++ b/java/Android.mk
@@ -33,10 +33,6 @@ LOCAL_AAPT_FLAGS := -0 .dict
 # Include all the resources regardless of system supported locales
 LOCAL_AAPT_INCLUDE_ALL_RESOURCES := true
 
-# TODO: Remove res-lxx reference once L-release becomes public.
-res_dirs := res res-lxx
-LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs))
-
 LOCAL_SDK_VERSION := current
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml
index 5d8ef43f5..6f4e602ce 100644
--- a/java/AndroidManifest.xml
+++ b/java/AndroidManifest.xml
@@ -86,7 +86,7 @@
         </receiver>
 
         <activity android:name=".settings.SettingsActivity"
-                android:theme="@style/platformSettingsTheme"
+                android:theme="@style/platformActivityTheme"
                 android:label="@string/english_ime_settings"
                 android:uiOptions="splitActionBarWhenNarrow">
             <intent-filter>
@@ -95,7 +95,7 @@
         </activity>
 
         <activity android:name=".spellcheck.SpellCheckerSettingsActivity"
-                  android:theme="@style/platformSettingsTheme"
+                  android:theme="@style/platformActivityTheme"
                   android:label="@string/android_spell_checker_settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -103,7 +103,7 @@
         </activity>
 
         <activity android:name=".settings.DebugSettingsActivity"
-                android:theme="@style/platformSettingsTheme"
+                android:theme="@style/platformActivityTheme"
                 android:label="@string/english_ime_debug_settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -150,7 +150,7 @@
         </receiver>
 
         <activity android:name="com.android.inputmethod.dictionarypack.DictionarySettingsActivity"
-                android:theme="@style/platformSettingsTheme"
+                android:theme="@style/platformActivityTheme"
                 android:label="@string/dictionary_settings_title"
                 android:uiOptions="splitActionBarWhenNarrow">
             <intent-filter>
diff --git a/java/res-lxx/values-v21/platform-theme.xml b/java/res/values-v20/platform-theme.xml
similarity index 51%
rename from java/res-lxx/values-v21/platform-theme.xml
rename to java/res/values-v20/platform-theme.xml
index a49e36459..52e7f3521 100644
--- a/java/res-lxx/values-v21/platform-theme.xml
+++ b/java/res/values-v20/platform-theme.xml
@@ -18,21 +18,9 @@
 */
 -->
 
+<!-- TODO: This file is temporarily placed under values-v20. -->
+<!-- TODO: It might be moved under values-v21. -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
     <style name="platformActivityTheme" parent="@android:style/Theme.Material.Light" />
-    <!-- From packages/apps/Settings -->
-    <style name="platformSettingsTheme" parent="@android:style/Theme.Material.Settings">
-        <item name="android:actionBarStyle">@android:style/Widget.Material.Light.ActionBar.Solid</item>
-        <item name="android:alertDialogTheme">@style/Theme.AlertDialog</item>
-    </style>
-    <!-- From packages/apps/Settings -->
-    <style name="Theme.AlertDialog" parent="@*android:style/Theme.Material.Light.Dialog.Alert">
-        <!-- Used by the ActionBar: @color/theme_primary -->
-        <item name="android:colorPrimary">#ff263238</item>
-        <!-- Used by the StatusBar: @color/theme_primary_dark -->
-        <item name="android:colorPrimaryDark">#ff21272b</item>
-        <!-- Used by controls, e.g. CheckBox, ProgressBar, etc.: @color/theme_accent -->
-        <item name="android:colorAccent">#ff009688</item>
-    </style>
     <style name="platformDialogTheme" parent="@android:style/Theme.Material.Light.Dialog" />
 </resources>
diff --git a/java/res/values/platform-theme.xml b/java/res/values/platform-theme.xml
index e68859712..8e131a2b0 100644
--- a/java/res/values/platform-theme.xml
+++ b/java/res/values/platform-theme.xml
@@ -20,6 +20,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
     <style name="platformActivityTheme" parent="@android:style/Theme.Holo" />
-    <style name="platformSettingsTheme" parent="@android:style/Theme.Holo" />
     <style name="platformDialogTheme" parent="@android:style/Theme.Holo.Dialog" />
 </resources>