diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-07-17 19:23:35 -0700 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2014-07-18 15:30:30 -0700 |
| commit | de1ab73efbe3520059647924857a2d7b82e2fbe7 (patch) | |
| tree | aa174040423e454dc9aa6f234892a5e576bcbee2 | |
| parent | e645715b2575d462dafd09e98fce84555549b65b (diff) | |
| download | latinime-de1ab73efbe3520059647924857a2d7b82e2fbe7.tar.gz latinime-de1ab73efbe3520059647924857a2d7b82e2fbe7.tar.xz latinime-de1ab73efbe3520059647924857a2d7b82e2fbe7.zip | |
Use Theme.DeviceDefault theme
For API 21 (and later), Theme.DeviceDefault.Light is specified.
This CL must be checked in together with Ic91f28df81.
Bug: 11866784
Bug: 13888366
Bug: 15781377
Change-Id: I01b288473128fc2491d3663e90cab56d0ba2d704
| -rw-r--r-- | java/AndroidManifest.xml | 8 | ||||
| -rw-r--r-- | java/res/values-v21/platform-theme.xml (renamed from java/res/values-v20/platform-theme.xml) | 7 | ||||
| -rw-r--r-- | java/res/values/platform-theme.xml | 5 |
3 files changed, 10 insertions, 10 deletions
diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml index ab9b13eb5..702b7aea2 100644 --- a/java/AndroidManifest.xml +++ b/java/AndroidManifest.xml @@ -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> diff --git a/java/res/values-v20/platform-theme.xml b/java/res/values-v21/platform-theme.xml index 52e7f3521..2a54798b8 100644 --- a/java/res/values-v20/platform-theme.xml +++ b/java/res/values-v21/platform-theme.xml @@ -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> diff --git a/java/res/values/platform-theme.xml b/java/res/values/platform-theme.xml index 8e131a2b0..2854ff72f 100644 --- a/java/res/values/platform-theme.xml +++ b/java/res/values/platform-theme.xml @@ -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> |