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

Commit 1bdb01a0 authored by Satoshi Kataoka's avatar Satoshi Kataoka Committed by Android Git Automerger
Browse files

am f23a2df3: am f9485002: Merge "Fix the issue on the input method switch picker" into jb-mr1-dev 

* commit 'f23a2df3':
  Fix the issue on the input method switch picker
parents 5bfa59b3 f23a2df3

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

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

        if (!TextUtils.isEmpty(inputMethodId)) {

            intent.putExtra(Settings.EXTRA_INPUT_METHOD_ID, inputMethodId);

            intent.putExtra(Settings.EXTRA_INPUT_METHOD_ID, inputMethodId);

        }

        }

        mContext.startActivity(intent);

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

    }

    }





    private void showConfigureInputMethods() {

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

        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK

                | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED

                | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED

                | Intent.FLAG_ACTIVITY_CLEAR_TOP);

                | Intent.FLAG_ACTIVITY_CLEAR_TOP);

        mContext.startActivity(intent);

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

    }

    }





    private boolean isScreenLocked() {

    private boolean isScreenLocked() {