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

Commit 1d472f85 authored by Yohei Yukawa's avatar Yohei Yukawa Committed by android-build-merger
Browse files

Merge "Remove "Other keyboards" from IME switcher dialog." into nyc-dev 

am: 4f172d86

* commit '4f172d86':
  Remove "Other keyboards" from IME switcher dialog.

Change-Id: I050ddfa248c891ac07b3bf188903f15cf85267ef
parents fb7ce670 4f172d86

core/res/res/values/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -2945,8 +2945,6 @@ 


    <!-- Title of the pop-up dialog in which the user switches keyboard, also known as input method. -->

    <string name="select_input_method">Change keyboard</string>

    <!-- Title of a button to open the settings to enable or disable other soft keyboards (also known as input methods) [CHAR LIMIT=30] -->

    <string name="configure_input_methods">Other keyboards</string>

    <!-- Summary text of a toggle switch to enable/disable use of the IME while a physical

         keyboard is connected -->

    <string name="show_ime">Keep it on screen while physical keyboard is active</string>

core/res/res/values/symbols.xml

+0 −1
Original line number Diff line number Diff line
@@ -1810,7 +1810,6 @@ 
  <java-symbol type="string" name="config_wimaxServiceClassname" />

  <java-symbol type="string" name="config_wimaxServiceJarLocation" />

  <java-symbol type="string" name="config_wimaxStateTrackerClassname" />

  <java-symbol type="string" name="configure_input_methods" />

  <java-symbol type="string" name="data_usage_3g_limit_snoozed_title" />

  <java-symbol type="string" name="data_usage_3g_limit_title" />

  <java-symbol type="string" name="data_usage_4g_limit_snoozed_title" />

services/core/java/com/android/server/InputMethodManagerService.java

+0 −10
Original line number Diff line number Diff line
@@ -3221,16 +3221,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
            };

            mDialogBuilder.setSingleChoiceItems(adapter, checkedItem, choiceListener);



            if (!isScreenLocked) {

                final OnClickListener positiveListener = new OnClickListener() {

                    @Override

                    public void onClick(DialogInterface dialog, int whichButton) {

                        showConfigureInputMethods();

                    }

                };

                mDialogBuilder.setPositiveButton(

                        com.android.internal.R.string.configure_input_methods, positiveListener);

            }

            mSwitchingDialog = mDialogBuilder.create();

            mSwitchingDialog.setCanceledOnTouchOutside(true);

            mSwitchingDialog.getWindow().setType(