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

Commit 440aab54 authored by satok's avatar satok
Browse files

Removed InputMethodSubtypePicker 

Change-Id: I08abac5d65a30c02cc671f4f70e93df25b6c8a92
parent fc19b844

api/current.xml

+0 −11
Original line number Diff line number Diff line
@@ -221434,17 +221434,6 @@ 
 visibility="public"

>

</method>

<method name="showInputMethodSubtypePicker"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="showSoftInput"

 return="boolean"

 abstract="false"

core/java/android/view/inputmethod/InputMethodManager.java

+0 −10
Original line number Diff line number Diff line
@@ -1430,16 +1430,6 @@ public final class InputMethodManager { 
        }

    }



    public void showInputMethodSubtypePicker() {

        synchronized (mH) {

            try {

                mService.showInputMethodSubtypePickerFromClient(mClient);

            } catch (RemoteException e) {

                Log.w(TAG, "IME died: " + mCurId, e);

            }

        }

    }



    public void showInputMethodAndSubtypeEnabler(String topId) {

        synchronized (mH) {

            try {

core/java/com/android/internal/view/IInputMethodManager.aidl

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ interface IInputMethodManager { 
            int softInputMode, boolean first, int windowFlags);

            

    void showInputMethodPickerFromClient(in IInputMethodClient client);

    void showInputMethodSubtypePickerFromClient(in IInputMethodClient client);

    void showInputMethodAndSubtypeEnablerFromClient(in IInputMethodClient client, String topId);

    void setInputMethod(in IBinder token, String id);

    void setInputMethodAndSubtype(in IBinder token, String id, in InputMethodSubtype subtype);

packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodButton.java

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ public class InputMethodButton extends ImageView { 
            public void onClick(View v) {

                switch (mId) {

                    case ID_IME_SWITCH_BUTTON:

                        mImm.showInputMethodSubtypePicker();

                        mImm.showInputMethodPicker();

                        break;

                    case ID_IME_SHORTCUT_BUTTON:

                        if (mToken != null && mShortcutInfo != null) {

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

+2 −24
Original line number Diff line number Diff line
@@ -1277,34 +1277,12 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
                        + Binder.getCallingUid() + ": " + client);

            }



            mHandler.sendEmptyMessage(MSG_SHOW_IM_PICKER);

        }

    }



    public void showInputMethodSubtypePickerFromClient(IInputMethodClient client) {

        synchronized (mMethodMap) {

            if (mCurClient == null || client == null

                    || mCurClient.client.asBinder() != client.asBinder()) {

                Slog.w(TAG, "Ignoring showInputMethodSubtypePickerFromClient of: " + client);

            }



            // Always call subtype picker, because subtype picker is a superset of input method

            // picker.

            mHandler.sendEmptyMessage(MSG_SHOW_IM_SUBTYPE_PICKER);

        }

    }



    public void showInputMethodAndSubtypeEnablerFromClient(

            IInputMethodClient client, String topId) {

        // TODO: Handle topId for setting the top position of the list activity

        synchronized (mMethodMap) {

            if (mCurClient == null || client == null

                    || mCurClient.client.asBinder() != client.asBinder()) {

                Slog.w(TAG, "Ignoring showInputMethodAndSubtypeEnablerFromClient of: " + client);

            }



            mHandler.sendEmptyMessage(MSG_SHOW_IM_SUBTYPE_ENABLER);

        }

    }



    public void setInputMethod(IBinder token, String id) {

        setInputMethodWithSubtypeId(token, id, NOT_A_SUBTYPE_ID);

    }