Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6785ea5 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android Git Automerger
Browse files

am de1ab73e: Use Theme.DeviceDefault theme 

* commit 'de1ab73e':
  Use Theme.DeviceDefault theme
parents a7783b28 de1ab73e

java/AndroidManifest.xml

+4 −4
Original line number Diff line number Diff line
@@ -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>

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

+3 −4
Original line number Diff line number Diff line
@@ -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>

java/res/values/platform-theme.xml

+3 −2
Original line number Diff line number Diff line
@@ -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>