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

am f6785ea5: am de1ab73e: Use Theme.DeviceDefault theme 

* commit 'f6785ea588799bf58140f2b315098e0b165f7665':
  Use Theme.DeviceDefault theme
main
Tadashi G. Takaoka 2014-07-21 18:37:20 +00:00 committed by Android Git Automerger
parent 6aa218ad0c f6785ea588
commit d93f8c5947
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
java/AndroidManifest.xml
View File

@ -86,7 +86,7 @@
</receiver>
<activity android:name=".settings.SettingsActivity"
android:theme="@style/platformActivityTheme"
android:theme="@style/platformSettingsTheme"
android:label="@string/english_ime_settings"
android:uiOptions="splitActionBarWhenNarrow">
<intent-filter>
@ -95,7 +95,7 @@
</activity>
<activity android:name=".spellcheck.SpellCheckerSettingsActivity"
android:theme="@style/platformActivityTheme"
android:theme="@style/platformSettingsTheme"
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/platformActivityTheme"
android:theme="@style/platformSettingsTheme"
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/platformActivityTheme"
android:theme="@style/platformSettingsTheme"
android:label="@string/dictionary_settings_title"
android:uiOptions="splitActionBarWhenNarrow">
<intent-filter>

7
java/res/values-v20/platform-theme.xml → java/res/values-v21/platform-theme.xml
View File

@ -18,9 +18,8 @@
*/
-->
<!-- 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" />
<style name="platformDialogTheme" parent="@android:style/Theme.Material.Light.Dialog" />
<style name="platformActivityTheme" parent="@android:style/Theme.DeviceDefault.Light" />
<style name="platformSettingsTheme" parent="@android:style/Theme.DeviceDefault.Light" />
<style name="platformDialogTheme" parent="@android:style/Theme.DeviceDefault.Light.Dialog" />
</resources>

5
java/res/values/platform-theme.xml
View File

@ -19,6 +19,7 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="platformActivityTheme" parent="@android:style/Theme.Holo" />
<style name="platformDialogTheme" parent="@android:style/Theme.Holo.Dialog" />
<style name="platformActivityTheme" parent="@android:style/Theme.DeviceDefault" />
<style name="platformSettingsTheme" parent="@android:style/Theme.DeviceDefault" />
<style name="platformDialogTheme" parent="@android:style/Theme.DeviceDefault.Dialog" />
</resources>