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

Commit a6906a62 authored by Ken Wakasa's avatar Ken Wakasa Committed by Android (Google) Code Review
Browse files

Merge "Move settings related classes to "settings""

parents 71dc7a38 a7d2fc6b

java/AndroidManifest.xml

+19 −16
Original line number Diff line number Diff line
@@ -51,7 +51,8 @@ 
            <intent-filter>

                <action android:name="android.service.textservice.SpellCheckerService" />

            </intent-filter>

            <meta-data android:name="android.view.textservice.scs" android:resource="@xml/spellchecker" />

            <meta-data android:name="android.view.textservice.scs"

                    android:resource="@xml/spellchecker" />

        </service>



        <activity android:name=".setup.SetupActivity"
@@ -81,21 +82,23 @@ 
            </intent-filter>

        </receiver>



        <activity android:name="SettingsActivity" android:label="@string/english_ime_settings"

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

                android:label="@string/english_ime_settings"

                android:uiOptions="splitActionBarWhenNarrow">

            <intent-filter>

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

            </intent-filter>

        </activity>



        <activity android:name="com.android.inputmethod.latin.spellcheck.SpellCheckerSettingsActivity"

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

                  android:label="@string/android_spell_checker_settings">

            <intent-filter>

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

            </intent-filter>

        </activity>



        <activity android:name="DebugSettingsActivity" android:label="@string/english_ime_debug_settings">

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

                android:label="@string/english_ime_debug_settings">

            <intent-filter>

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

            </intent-filter>

java/res/xml/method.xml

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ 
<!-- If IME doesn't have an applicable subtype, the first subtype will be used as a default

     subtype.-->

<input-method xmlns:android="http://schemas.android.com/apk/res/android"

        android:settingsActivity="com.android.inputmethod.latin.SettingsActivity"

        android:settingsActivity="com.android.inputmethod.latin.settings.SettingsActivity"

        android:isDefault="@bool/im_is_default">

    <subtype android:icon="@drawable/ic_subtype_keyboard"

            android:label="@string/subtype_en_US"

java/res/xml/prefs.xml

+3 −3
Original line number Diff line number Diff line
@@ -167,17 +167,17 @@ 
            <ListPreference

                android:key="pref_key_preview_popup_dismiss_delay"

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

            <com.android.inputmethod.latin.SeekBarDialogPreference

            <com.android.inputmethod.latin.settings.SeekBarDialogPreference

                android:key="pref_key_longpress_timeout"

                android:title="@string/prefs_key_longpress_timeout_settings"

                latin:minValue="@integer/config_min_longpress_timeout"

                latin:maxValue="@integer/config_max_longpress_timeout"

                latin:stepValue="@integer/config_longpress_timeout_step" />

            <com.android.inputmethod.latin.SeekBarDialogPreference

            <com.android.inputmethod.latin.settings.SeekBarDialogPreference

                android:key="pref_vibration_duration_settings"

                android:title="@string/prefs_keypress_vibration_duration_settings"

                latin:maxValue="@integer/config_max_vibration_duration" />

            <com.android.inputmethod.latin.SeekBarDialogPreference

            <com.android.inputmethod.latin.settings.SeekBarDialogPreference

                android:key="pref_keypress_sound_volume"

                android:title="@string/prefs_keypress_sound_volume_settings"

                latin:maxValue="100" /> <!-- percent -->

java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java

+2 −2
Original line number Diff line number Diff line
@@ -36,10 +36,10 @@ import com.android.inputmethod.latin.LatinIME; 
import com.android.inputmethod.latin.LatinImeLogger;

import com.android.inputmethod.latin.R;

import com.android.inputmethod.latin.RichInputMethodManager;

import com.android.inputmethod.latin.Settings;

import com.android.inputmethod.latin.SettingsValues;

import com.android.inputmethod.latin.SubtypeSwitcher;

import com.android.inputmethod.latin.WordComposer;

import com.android.inputmethod.latin.settings.Settings;

import com.android.inputmethod.latin.settings.SettingsValues;



public final class KeyboardSwitcher implements KeyboardState.SwitchActions {

    private static final String TAG = KeyboardSwitcher.class.getSimpleName();

java/src/com/android/inputmethod/keyboard/MainKeyboardView.java

+2 −2
Original line number Diff line number Diff line
@@ -57,13 +57,13 @@ import com.android.inputmethod.keyboard.internal.PreviewPlacerView; 
import com.android.inputmethod.keyboard.internal.SlidingKeyInputPreview;

import com.android.inputmethod.keyboard.internal.TouchScreenRegulator;

import com.android.inputmethod.latin.Constants;

import com.android.inputmethod.latin.DebugSettings;

import com.android.inputmethod.latin.LatinImeLogger;

import com.android.inputmethod.latin.R;

import com.android.inputmethod.latin.Settings;

import com.android.inputmethod.latin.SubtypeLocale;

import com.android.inputmethod.latin.SuggestedWords;

import com.android.inputmethod.latin.define.ProductionFlag;

import com.android.inputmethod.latin.settings.DebugSettings;

import com.android.inputmethod.latin.settings.Settings;

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

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

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