nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

am 938bb4a4: Revert "Use Settings app\'s theme for L and later"

Browse source 
* commit '938bb4a4d50114eb741a128f7a75d50f1af55869':
  Revert "Use Settings app's theme for L and later"
This commit is contained in:
Mikhail Naganov 2014-06-27 13:00:26 +00:00 committed by Android Git Automerger
commit 940a402cd2
4 changed files with 6 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
java/Android.mk
View file

@ -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

8
java/AndroidManifest.xml
View file

@ -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>

16
java/res-lxx/values-v21/platform-theme.xml → java/res/values-v20/platform-theme.xml
View file

@ -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>

1
java/res/values/platform-theme.xml
View file

@ -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>