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

Commit 37f326b1 authored by satok's avatar satok Committed by Android (Google) Code Review
Browse files

Merge "[Step 1] Add preference activities for spell checkers"

parents b98463f8 e077d2b6

AndroidManifest.xml

+20 −0
Original line number Diff line number Diff line
@@ -364,6 +364,26 @@ 
                android:resource="@id/language_settings" />

        </activity>



        <activity android:name="Settings$SpellCheckersSettingsActivity"

                android:label="@string/spellcheckers_settings_title"

                android:clearTaskOnLaunch="true">

            <intent-filter>

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

                <action android:name="com.android.settings.VOICE_INPUT_OUTPUT_SETTINGS" />

                <category android:name="android.intent.category.VOICE_LAUNCH" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.inputmethod.SpellCheckersSettings" />

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

                android:resource="@id/language_settings" />

            <meta-data android:name="com.android.settings.PARENT_FRAGMENT_TITLE"

                android:resource="@string/language_keyboard_settings_title" />

            <meta-data android:name="com.android.settings.PARENT_FRAGMENT_CLASS"

                android:value="com.android.settings.Settings$InputMethodAndLanguageSettingsActivity" />

        </activity>



        <activity android:name=".inputmethod.InputMethodAndSubtypeEnablerActivity"

                android:label=""

                android:clearTaskOnLaunch="true">

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -3586,4 +3586,6 @@ found in the list of installed applications.</string> 
    <!-- Instruction for touch exploration tutorial lesson 2, displayed after the user has scrolled a large amount. -->

    <string name="accessibility_tutorial_lesson_2_text_4">You have completed the tutorial. To exit and return to the Talk As I Touch setting, find and tap the <xliff:g id="finish" example="Finish">%s</xliff:g> button.</string>



    <!--  Title for spelling correction settings -->

    <string name="spellcheckers_settings_title">Spelling correction</string>

</resources>

res/xml/language_settings.xml

+4 −0
Original line number Diff line number Diff line
@@ -30,6 +30,10 @@ 
        <PreferenceScreen

                 android:key="key_user_dictionary_settings" />



        <com.android.settings.inputmethod.SpellCheckersPreference

                 android:key="spellcheckers_settings"

                 android:title="@string/spellcheckers_settings_title"/>



    </PreferenceCategory>



    <PreferenceCategory android:key="keyboard_settings_category"

res/xml/spellchecker_prefs.xml

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

<!-- Copyright (C) 2011 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.

-->



<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"

        android:title="@string/spellcheckers_settings_title">



</PreferenceScreen>

src/com/android/settings/Settings.java

+1 −0
Original line number Diff line number Diff line
@@ -562,6 +562,7 @@ public class Settings extends PreferenceActivity implements ButtonBarHandler { 
    public static class WifiP2pSettingsActivity extends Settings { /* empty */ }

    public static class InputMethodAndLanguageSettingsActivity extends Settings { /* empty */ }

    public static class InputMethodAndSubtypeEnablerActivity extends Settings { /* empty */ }

    public static class SpellCheckersSettingsActivity extends Settings { /* empty */ }

    public static class LocalePickerActivity extends Settings { /* empty */ }

    public static class UserDictionarySettingsActivity extends Settings { /* empty */ }

    public static class SoundSettingsActivity extends Settings { /* empty */ }