Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'f23a2df326418bdc42c2e27a66383a60935f1f05':
  Fix the issue on the input method switch picker
This commit is contained in:
Satoshi Kataoka
2012-10-05 18:02:24 -07:00
committed by Android Git Automerger
parent 5bfa59b32f f23a2df326
commit 1bdb01a099
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/java/com/android/server/InputMethodManagerService.java
View File

@@ -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() {