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

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

Remove manual config item controlling to show input language settings 

Change-Id: I77f831c653567f2cf214a5b61107b25cca6d751d
parent 0e8bbe3a

java/res/values-xlarge/config.xml

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 


<resources>

    <bool name="config_enable_show_settings_key_option">false</bool>

    <bool name="config_enable_show_subtype_settings">false</bool>

    <bool name="config_enable_show_voice_key_option">false</bool>

    <!-- TODO: This configuration value is temporary set true to check popup preview behavior. -->

    <bool name="config_enable_show_popup_on_keypress_option">true</bool>

java/res/values/config.xml

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
<resources>

    <bool name="config_swipeDisambiguation">true</bool>

    <bool name="config_enable_show_settings_key_option">true</bool>

    <bool name="config_enable_show_subtype_settings">true</bool>

    <bool name="config_enable_show_voice_key_option">true</bool>

    <bool name="config_enable_show_popup_on_keypress_option">true</bool>

    <bool name="config_enable_show_recorrection_option">true</bool>

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

+8 −8
Original line number Diff line number Diff line
@@ -1007,8 +1007,9 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar 
    }



    private void onSettingsKeyPressed() {

        if (!isShowingOptionDialog()) {

            if (!mSettingsValues.mEnableShowSubtypeSettings) {

        if (isShowingOptionDialog())

            return;

        if (InputMethodServiceCompatWrapper.CAN_HANDLE_ON_CURRENT_INPUT_METHOD_SUBTYPE_CHANGED) {

            showSubtypeSelectorAndSettings();

        } else if (Utils.hasMultipleEnabledIMEsOrSubtypes(mImm)) {

            showOptionsMenu();
@@ -1016,7 +1017,6 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar 
            launchSettings();

        }

    }

    }



    private void onSettingsKeyLongPressed() {

        if (!isShowingOptionDialog()) {

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

+1 −7
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ public class Settings extends PreferenceActivity 


    public static class Values {

        // From resources:

        public final boolean mEnableShowSubtypeSettings;

        public final boolean mSwipeDownDismissKeyboardEnabled;

        public final int mDelayBeforeFadeoutLanguageOnSpacebar;

        public final int mDelayUpdateSuggestions;
@@ -128,8 +127,6 @@ public class Settings extends PreferenceActivity 
            }



            // Get the resources

            mEnableShowSubtypeSettings = res.getBoolean(

                    R.bool.config_enable_show_subtype_settings);

            mSwipeDownDismissKeyboardEnabled = res.getBoolean(

                    R.bool.config_swipe_down_dismiss_keyboard_enabled);

            mDelayBeforeFadeoutLanguageOnSpacebar = res.getInteger(
@@ -371,10 +368,7 @@ public class Settings extends PreferenceActivity 
            generalSettings.removePreference(findPreference(PREF_VIBRATE_ON));

        }



        final boolean showSubtypeSettings = res.getBoolean(

                R.bool.config_enable_show_subtype_settings);

        if (InputMethodServiceCompatWrapper.CAN_HANDLE_ON_CURRENT_INPUT_METHOD_SUBTYPE_CHANGED

                && !showSubtypeSettings) {

        if (InputMethodServiceCompatWrapper.CAN_HANDLE_ON_CURRENT_INPUT_METHOD_SUBTYPE_CHANGED) {

            generalSettings.removePreference(findPreference(PREF_SUBTYPES));

        }