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

Merge "Make sure that Toast is always shown by Meta-Space." into nyc-dev

Browse Source 
am: cd1e1de

* commit 'cd1e1de4cebbb8257e9ab827ab3727c7c4fe1cae':
  Make sure that Toast is always shown by Meta-Space.

Change-Id: I401a3871d92c379d653a67c12b09c34647e2ed11
This commit is contained in:
Yohei Yukawa
2016-04-12 16:28:57 +00:00
committed by android-build-merger
parent a4677ee158 cd1e1de4ce
commit ad56f85230
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
services/core/java/com/android/server/InputMethodManagerService.java
View File

@@ -2966,16 +2966,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
return;
}
setInputMethodLocked(nextSubtype.mImi.getId(), nextSubtype.mSubtypeId);
if (mSubtypeSwitchedByShortCutToast != null) {
mSubtypeSwitchedByShortCutToast.cancel();
mSubtypeSwitchedByShortCutToast = null;
}
if ((mImeWindowVis & InputMethodService.IME_VISIBLE) != 0) {
// IME window is shown. The user should be able to visually understand that the
// subtype is changed in most of cases. To avoid UI overlap, we do not show a toast
// in this case.
return;
}
final InputMethodInfo newInputMethodInfo = mMethodMap.get(mCurMethodId);
if (newInputMethodInfo == null) {
return;
@@ -2983,8 +2973,12 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
final CharSequence toastText = InputMethodUtils.getImeAndSubtypeDisplayName(mContext,
newInputMethodInfo, mCurrentSubtype);
if (!TextUtils.isEmpty(toastText)) {
mSubtypeSwitchedByShortCutToast = Toast.makeText(mContext, toastText.toString(),
Toast.LENGTH_SHORT);
if (mSubtypeSwitchedByShortCutToast == null) {
mSubtypeSwitchedByShortCutToast = Toast.makeText(mContext, toastText,
Toast.LENGTH_SHORT);
} else {
mSubtypeSwitchedByShortCutToast.setText(toastText);
}
mSubtypeSwitchedByShortCutToast.show();
}
}