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

Revert "Allow power button to close an input method"

Browse Source 
This reverts commit d28e907183.
Test: manually tested

BUG: 33038203
Change-Id: I7a4c6e95a69abb2e40df73509b6e67b93eacf6ff
This commit is contained in:
Mark Renouf
2016-12-02 16:00:10 -05:00
parent a6dbd4934c
commit 28f0e5bf48
3 changed files with 0 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/view/WindowManagerPolicy.java
View File

@@ -483,16 +483,6 @@ public interface WindowManagerPolicy {
*/ */
public void switchInputMethod(boolean forwardDirection); 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 shutdown(boolean confirm);
public void reboot(boolean confirm); public void reboot(boolean confirm);
public void rebootSafeMode(boolean confirm); public void rebootSafeMode(boolean confirm);

9
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -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 = 2;
static final int SHORT_PRESS_POWER_REALLY_GO_TO_SLEEP_AND_GO_HOME = 3; 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_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_NOTHING = 0;
static final int LONG_PRESS_POWER_GLOBAL_ACTIONS = 1; static final int LONG_PRESS_POWER_GLOBAL_ACTIONS = 1;
@@ -1303,14 +1302,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
case SHORT_PRESS_POWER_GO_HOME: case SHORT_PRESS_POWER_GO_HOME:
launchHomeFromHotKey(true /* awakenFromDreams */, false /*respectKeyguard*/); launchHomeFromHotKey(true /* awakenFromDreams */, false /*respectKeyguard*/);
break; break;
case SHORT_PRESS_POWER_CLOSE_IME_OR_GO_HOME:
if (mWindowManagerFuncs.isInputMethodWindowVisible()) {
mWindowManagerFuncs.hideCurrentInputMethod();
} else {
launchHomeFromHotKey(true /* awakenFromDreams */,
false /*respectKeyguard*/);
}
break;
} }
} }
} }

18
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -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. // Called by window manager policy. Not exposed externally.
@Override @Override
public void lockDeviceNow() { public void lockDeviceNow() {