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

Commit f9485002 authored by Satoshi Kataoka's avatar Satoshi Kataoka Committed by Android (Google) Code Review
Browse files

Merge "Fix the issue on the input method switch picker" into jb-mr1-dev

parents 020daada 3ba439d6

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

+2 −2
Original line number Diff line number Diff line
@@ -2531,7 +2531,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
        if (!TextUtils.isEmpty(inputMethodId)) {

            intent.putExtra(Settings.EXTRA_INPUT_METHOD_ID, inputMethodId);

        }

        mContext.startActivity(intent);

        mContext.startActivityAsUser(intent, null, UserHandle.CURRENT);

    }



    private void showConfigureInputMethods() {
@@ -2539,7 +2539,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK

                | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED

                | Intent.FLAG_ACTIVITY_CLEAR_TOP);

        mContext.startActivity(intent);

        mContext.startActivityAsUser(intent, null, UserHandle.CURRENT);

    }



    private boolean isScreenLocked() {