diff options
3 files changed, 0 insertions, 37 deletions
diff --git a/core/java/android/view/WindowManagerPolicy.java b/core/java/android/view/WindowManagerPolicy.java index c8e3b7dfbae9..46a0194b1b09 100644 --- a/core/java/android/view/WindowManagerPolicy.java +++ b/core/java/android/view/WindowManagerPolicy.java @@ -483,16 +483,6 @@ public interface WindowManagerPolicy { */ public void switchInputMethod(boolean forwardDirection); - /** - * Returns the visibility of the current input method window (false if there is none). - */ - public boolean isInputMethodWindowVisible(); - - /** - * Hides the current input method, if visible. - */ - public void hideCurrentInputMethod(); - public void shutdown(boolean confirm); public void reboot(boolean confirm); public void rebootSafeMode(boolean confirm); diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index 6ae7a589ab9e..b2f6cd2fd900 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -189,7 +189,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { static final int SHORT_PRESS_POWER_REALLY_GO_TO_SLEEP = 2; static final int SHORT_PRESS_POWER_REALLY_GO_TO_SLEEP_AND_GO_HOME = 3; static final int SHORT_PRESS_POWER_GO_HOME = 4; - static final int SHORT_PRESS_POWER_CLOSE_IME_OR_GO_HOME = 5; static final int LONG_PRESS_POWER_NOTHING = 0; static final int LONG_PRESS_POWER_GLOBAL_ACTIONS = 1; @@ -1303,14 +1302,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { case SHORT_PRESS_POWER_GO_HOME: launchHomeFromHotKey(true /* awakenFromDreams */, false /*respectKeyguard*/); break; - case SHORT_PRESS_POWER_CLOSE_IME_OR_GO_HOME: - if (mWindowManagerFuncs.isInputMethodWindowVisible()) { - mWindowManagerFuncs.hideCurrentInputMethod(); - } else { - launchHomeFromHotKey(true /* awakenFromDreams */, - false /*respectKeyguard*/); - } - break; } } } diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 42dc6e463774..ca2610af3f66 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -5786,24 +5786,6 @@ public class WindowManagerService extends IWindowManager.Stub } } - // Called by window manager policy. Not exposed externally. - @Override - public boolean isInputMethodWindowVisible() { - synchronized (mWindowMap) { - return mInputMethodWindow != null && mInputMethodWindow.isVisibleLw(); - } - } - - // Called by window manager policy. Not exposed externally. - @Override - public void hideCurrentInputMethod() { - final InputMethodManagerInternal inputMethodManagerInternal = - LocalServices.getService(InputMethodManagerInternal.class); - if (inputMethodManagerInternal != null) { - inputMethodManagerInternal.hideCurrentInputMethod(); - } - } - // Called by window manager policy. Not exposed externally. @Override public void lockDeviceNow() { |