n/futokb
1
0
Fork 0
mirror of https://gitlab.futo.org/keyboard/latinime.git synced 2024-09-28 14:54:30 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use Theme.DeviceDefault theme

Browse Source 
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
This commit is contained in:
Tadashi G. Takaoka 2014-07-17 19:23:35 -07:00
parent e645715b25
commit de1ab73efb
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>