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

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

Merge "Show subtype settings preference for new design"

parents 98d2e4c8 b9e56cde

java/res/xml/prefs.xml

+4 −4
Original line number Diff line number Diff line
@@ -18,6 +18,10 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:title="@string/english_ime_settings"

    android:key="english_ime_settings">

    <PreferenceScreen

        android:key="subtype_settings"

        android:title="@string/language_selection_title"

        android:summary="@string/language_selection_summary" />

    <PreferenceCategory

        android:title="@string/general_category"

        android:key="general_settings">
@@ -60,10 +64,6 @@ 
            android:entryValues="@array/voice_input_modes_values"

            android:entries="@array/voice_input_modes"

            android:defaultValue="@string/voice_mode_main" />

        <PreferenceScreen

            android:key="subtype_settings"

            android:title="@string/language_selection_title"

            android:summary="@string/language_selection_summary" />

    </PreferenceCategory>

    <PreferenceCategory

        android:title="@string/correction_category"

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

+0 −4
Original line number Diff line number Diff line
@@ -375,10 +375,6 @@ public class Settings extends PreferenceActivity 
            generalSettings.removePreference(findPreference(PREF_VIBRATE_ON));

        }



        if (InputMethodServiceCompatWrapper.CAN_HANDLE_ON_CURRENT_INPUT_METHOD_SUBTYPE_CHANGED) {

            generalSettings.removePreference(findPreference(PREF_SUBTYPES));

        }



        final boolean showPopupOption = res.getBoolean(

                R.bool.config_enable_show_popup_on_keypress_option);

        if (!showPopupOption) {