android.policy: Fix launching home when waking the device with the home button (e941ebd6) · Commits · e / os / android_frameworks_base

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+10 −5

Original line number	Diff line number	Diff line
		@@ -528,6 +528,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		private int mPressOnAppSwitchBehavior = -1;
		private int mLongPressOnAppSwitchBehavior = -1;

		private boolean mHomePressed;

		// To identify simulated keypresses, so we can perform
		// the default action for that key
		private boolean mIsVirtualKeypress;
		@@ -2108,9 +2110,10 @@ public class PhoneWindowManager implements WindowManagerPolicy {

		// If we have released the home key, and didn't do anything else
		// while it was pressed, then it is time to go home!
		if (!down) {
		if (!down && mHomePressed) {
		final boolean homeWasLongPressed = mHomeLongPressed;
		mHomeLongPressed = false;
		mHomePressed = false;
		if (!homeWasLongPressed) {
		if (mRecentAppsPreloaded) {
		cancelPreloadRecentApps();
		@@ -2161,10 +2164,12 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		}
		}
		if (down) {
		if (repeatCount == 0) {
		mHomePressed = true;
		if (!mRecentAppsPreloaded && mLongPressOnHomeBehavior == KEY_ACTION_APP_SWITCH) {
		preloadRecentApps();
		}
		if (longPress) {
		} else if (longPress) {
		if (!keyguardOn && mLongPressOnHomeBehavior != KEY_ACTION_NOTHING) {
		performHapticFeedbackLw(null, HapticFeedbackConstants.LONG_PRESS, false);
		performKeyAction(mLongPressOnHomeBehavior);