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

Commit 9b46ddc1 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Use platform default theme for activities and dialogs 

Bug: 13698528
Change-Id: Ib904c911452525e3749c0eb287434b504576db5f
parent f977ca6c

java/AndroidManifest.xml

+8 −3
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 
        </service>



        <activity android:name=".setup.SetupActivity"

                android:theme="@style/platformActivityTheme"

                android:label="@string/english_ime_name"

                android:icon="@drawable/ic_launcher_keyboard"

                android:launchMode="singleTask"
@@ -68,6 +69,7 @@ 
        </activity>



        <activity android:name=".setup.SetupWizardActivity"

                android:theme="@style/platformActivityTheme"

                android:label="@string/english_ime_name"

                android:clearTaskOnLaunch="true">

            <intent-filter>
@@ -84,6 +86,7 @@ 
        </receiver>



        <activity android:name=".settings.SettingsActivity"

                android:theme="@style/platformActivityTheme"

                android:label="@string/english_ime_settings"

                android:uiOptions="splitActionBarWhenNarrow">

            <intent-filter>
@@ -92,6 +95,7 @@ 
        </activity>



        <activity android:name=".spellcheck.SpellCheckerSettingsActivity"

                  android:theme="@style/platformActivityTheme"

                  android:label="@string/android_spell_checker_settings">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />
@@ -99,6 +103,7 @@ 
        </activity>



        <activity android:name=".settings.DebugSettingsActivity"

                android:theme="@style/platformActivityTheme"

                android:label="@string/english_ime_debug_settings">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />
@@ -145,8 +150,8 @@ 
        </receiver>



        <activity android:name="com.android.inputmethod.dictionarypack.DictionarySettingsActivity"

                android:theme="@style/platformActivityTheme"

                android:label="@string/dictionary_settings_title"

                android:theme="@android:style/Theme.Holo"

                android:uiOptions="splitActionBarWhenNarrow">

            <intent-filter>

                <action android:name="android.intent.action.MAIN"/>
@@ -154,8 +159,8 @@ 
        </activity>



        <activity android:name="com.android.inputmethod.dictionarypack.DownloadOverMeteredDialog"

                android:label="@string/dictionary_install_over_metered_network_prompt"

                android:theme="@android:style/Theme.Holo">

                android:theme="@style/platformActivityTheme"

                android:label="@string/dictionary_install_over_metered_network_prompt">

            <intent-filter>

                <action android:name="android.intent.action.MAIN"/>

            </intent-filter>

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

0 → 100644
+29 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

**

** Copyright 2014, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->



<!-- 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">

    <!-- TODO: Use Theme.Quantum.Light once it is fixed.

    <style name="platformActivityTheme" parent="@android:style/Theme.Quantum.Light" />

    -->

    <style name="platformActivityTheme" parent="@android:style/Theme.Quantum.Light.NoActionBar.Fullscreen" />

    <style name="platformDialogTheme" parent="@android:style/Theme.Quantum.Light.Dialog" />

</resources>

java/res/values/platform-theme.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

**

** Copyright 2014, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->



<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" />

</resources>

java/src/com/android/inputmethod/latin/ImportantNoticeDialog.java

+2 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.content.DialogInterface.OnClickListener; 
import android.content.DialogInterface.OnDismissListener;

import android.content.DialogInterface.OnShowListener;



import com.android.inputmethod.latin.utils.DialogUtils;

import com.android.inputmethod.latin.utils.ImportantNoticeUtils;



/**
@@ -40,7 +41,7 @@ public final class ImportantNoticeDialog extends AlertDialog implements OnShowLi 


    public ImportantNoticeDialog(

            final Context context, final ImportantNoticeDialogListener listener) {

        super(context, THEME_HOLO_DARK);

        super(DialogUtils.getPlatformDialogThemeContext(context));

        mListener = listener;

        mNextImportantNoticeVersion = ImportantNoticeUtils.getNextImportantNoticeVersion(context);

        setMessage(ImportantNoticeUtils.getNextImportantNoticeContents(context));

java/src/com/android/inputmethod/latin/LatinIME.java

+4 −2
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ import com.android.inputmethod.latin.suggestions.SuggestionStripViewAccessor; 
import com.android.inputmethod.latin.utils.ApplicationUtils;

import com.android.inputmethod.latin.utils.CapsModeUtils;

import com.android.inputmethod.latin.utils.CoordinateUtils;

import com.android.inputmethod.latin.utils.DialogUtils;

import com.android.inputmethod.latin.utils.ImportantNoticeUtils;

import com.android.inputmethod.latin.utils.IntentUtils;

import com.android.inputmethod.latin.utils.JniUtils;
@@ -1662,8 +1663,9 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 
                }

            }

        };

        final AlertDialog.Builder builder =

                new AlertDialog.Builder(this).setItems(items, listener).setTitle(title);

        final AlertDialog.Builder builder = new AlertDialog.Builder(

                DialogUtils.getPlatformDialogThemeContext(this));

        builder.setItems(items, listener).setTitle(title);

        showOptionDialog(builder.create());

    }