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

Merge "Wait for KEY_SLEEP UP event before calling goToSleep()" into lmp-mr1-modular-dev

Browse Source
This commit is contained in:
Joe LaPenna
2015-05-14 20:55:08 +00:00
committed by Android (Google) Code Review
parent 951f23478d 018319a024
commit 627f26817f
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
View File

@@ -1063,15 +1063,18 @@ public class PhoneWindowManager implements WindowManagerPolicy {
} }
} }
private void sleepPress(KeyEvent event) { private void sleepPress(long eventTime) {
if (mShortPressOnSleepBehavior == SHORT_PRESS_SLEEP_GO_TO_SLEEP_AND_GO_HOME) {
launchHomeFromHotKey(false /* awakenDreams */, true /*respectKeyguard*/);
}
}
private void sleepRelease(long eventTime) {
switch (mShortPressOnSleepBehavior) { switch (mShortPressOnSleepBehavior) {
case SHORT_PRESS_SLEEP_GO_TO_SLEEP: case SHORT_PRESS_SLEEP_GO_TO_SLEEP:
mPowerManager.goToSleep(event.getEventTime(),
PowerManager.GO_TO_SLEEP_REASON_SLEEP_BUTTON, 0);
break;
case SHORT_PRESS_SLEEP_GO_TO_SLEEP_AND_GO_HOME: case SHORT_PRESS_SLEEP_GO_TO_SLEEP_AND_GO_HOME:
launchHomeFromHotKey(false /* awakenDreams */, true /*respectKeyguard*/); Slog.i(TAG, "sleepRelease() calling goToSleep(GO_TO_SLEEP_REASON_SLEEP_BUTTON)");
mPowerManager.goToSleep(event.getEventTime(), mPowerManager.goToSleep(eventTime,
PowerManager.GO_TO_SLEEP_REASON_SLEEP_BUTTON, 0); PowerManager.GO_TO_SLEEP_REASON_SLEEP_BUTTON, 0);
break; break;
} }
@@ -4779,7 +4782,11 @@ public class PhoneWindowManager implements WindowManagerPolicy {
if (!mPowerManager.isInteractive()) { if (!mPowerManager.isInteractive()) {
useHapticFeedback = false; // suppress feedback if already non-interactive useHapticFeedback = false; // suppress feedback if already non-interactive
} }
sleepPress(event); if (down) {
sleepPress(event.getEventTime());
} else {
sleepRelease(event.getEventTime());
}
break; break;
} }