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

Merge "Dismiss the ime switch notification properly"

Browse Source
This commit is contained in:
satok
2011-08-25 00:36:35 -07:00
committed by Android (Google) Code Review
parent b944c2186d dbf2950781
commit 47d0e48197
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -619,10 +619,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
} }
void updateImeWindowStatusLocked() { void updateImeWindowStatusLocked() {
if (mStatusBar != null) { setImeWindowStatus(mCurToken, mImeWindowVis, mBackDisposition);
mStatusBar.setImeWindowStatus(mCurToken, mImeWindowVis,
mBackDisposition);
}
} }
@Override @Override
@@ -995,6 +992,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
sessionState.session.finishSession(); sessionState.session.finishSession();
} catch (RemoteException e) { } catch (RemoteException e) {
Slog.w(TAG, "Session failed to close due to remote exception", e); Slog.w(TAG, "Session failed to close due to remote exception", e);
mImeWindowVis = 0;
updateImeWindowStatusLocked();
} }
} }
} }
@@ -1121,6 +1120,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
} }
} }
@SuppressWarnings("deprecation")
@Override @Override
public void setImeWindowStatus(IBinder token, int vis, int backDisposition) { public void setImeWindowStatus(IBinder token, int vis, int backDisposition) {
int uid = Binder.getCallingUid(); int uid = Binder.getCallingUid();
@@ -2591,6 +2591,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
} }
// TODO: We should change the return type from List to List<Parcelable> // TODO: We should change the return type from List to List<Parcelable>
@SuppressWarnings("rawtypes")
@Override @Override
public List getShortcutInputMethodsAndSubtypes() { public List getShortcutInputMethodsAndSubtypes() {
synchronized (mMethodMap) { synchronized (mMethodMap) {