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

am 3f64edec: Merge "Fix IME down caret in keyguard nav bar bug." into jb-mr1.1-dev

Browse Source 
* commit '3f64edec6c6b2e53b42cfd8c6a6765ecee084fc2':
  Fix IME down caret in keyguard nav bar bug.
This commit is contained in:
John Spurlock
2012-11-21 06:46:54 -08:00
committed by Android Git Automerger
parent 5985d106f7 3f64edec6c
commit ce393d3356
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -386,6 +386,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
private Locale mLastSystemLocale;
private final MyPackageMonitor mMyPackageMonitor = new MyPackageMonitor();
private final IPackageManager mIPackageManager;
private boolean mInputBoundToKeyguard;
class SettingsObserver extends ContentObserver {
SettingsObserver(Handler handler) {
@@ -877,10 +878,12 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
final boolean hardKeyShown = haveHardKeyboard
&& conf.hardKeyboardHidden
!= Configuration.HARDKEYBOARDHIDDEN_YES;
final boolean isScreenLocked = mKeyguardManager != null
&& mKeyguardManager.isKeyguardLocked()
&& mKeyguardManager.isKeyguardSecure();
mImeWindowVis = (!isScreenLocked && (mInputShown || hardKeyShown)) ?
final boolean isScreenLocked =
mKeyguardManager != null && mKeyguardManager.isKeyguardLocked();
final boolean isScreenSecurelyLocked =
isScreenLocked && mKeyguardManager.isKeyguardSecure();
final boolean inputShown = mInputShown && (!isScreenLocked || mInputBoundToKeyguard);
mImeWindowVis = (!isScreenSecurelyLocked && (inputShown || hardKeyShown)) ?
(InputMethodService.IME_ACTIVE | InputMethodService.IME_VISIBLE) : 0;
updateImeWindowStatusLocked();
}
@@ -1124,6 +1127,13 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
return mNoBinding;
}
if (mCurClient == null) {
mInputBoundToKeyguard = mKeyguardManager != null && mKeyguardManager.isKeyguardLocked();
if (DEBUG) {
Slog.v(TAG, "New bind. keyguard = " + mInputBoundToKeyguard);
}
}
if (mCurClient != cs) {
// If the client is changing, we need to switch over to the new
// one.