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

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

+10 −3

Original line number	Diff line number	Diff line
		@@ -471,6 +471,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		boolean mShowingLockscreen;
		boolean mShowingDream;
		boolean mDreamingLockscreen;
		boolean mHomePressed;
		boolean mHomeLongPressed;
		boolean mAppSwitchLongPressed;
		Intent mHomeIntent;
		@@ -2149,7 +2150,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {

		if (DEBUG_INPUT) {
		Log.d(TAG, "interceptKeyTi keyCode=" + keyCode + " down=" + down + " repeatCount="
		+ repeatCount + " keyguardOn=" + keyguardOn + " canceled=" + canceled);
		+ repeatCount + " keyguardOn=" + keyguardOn + " mHomePressed=" + mHomePressed
		+ " canceled=" + canceled);
		}

		// If we think we might have a volume down & power/volume-up key chord on the way
		@@ -2197,13 +2199,15 @@ 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();
		}
		mHomePressed = false;
		if (!canceled) {
		// If an incoming call is ringing, HOME is totally disabled.
		// (The user is already on the InCallScreen at this point,
		@@ -2252,7 +2256,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		if (!mRecentAppsPreloaded && mLongPressOnHomeBehavior == KEY_ACTION_APP_SWITCH) {
		preloadRecentApps();
		}
		if (longPress) {
		if (repeatCount == 0) {
		mHomePressed = true;
		} else if (longPress) {
		if (!keyguardOn && mLongPressOnHomeBehavior != KEY_ACTION_NOTHING) {
		performHapticFeedbackLw(null, HapticFeedbackConstants.LONG_PRESS, false);
		performKeyAction(mLongPressOnHomeBehavior);
		@@ -5154,6 +5160,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		pw.println(mForceStatusBarFromKeyguard);
		pw.print(prefix); pw.print("mDismissKeyguard="); pw.print(mDismissKeyguard);
		pw.print(" mWinDismissingKeyguard="); pw.print(mWinDismissingKeyguard);
		pw.print(" mHomePressed="); pw.println(mHomePressed);
		pw.print(prefix); pw.print("mAllowLockscreenWhenOn="); pw.print(mAllowLockscreenWhenOn);
		pw.print(" mLockScreenTimeout="); pw.print(mLockScreenTimeout);
		pw.print(" mLockScreenTimerActive="); pw.println(mLockScreenTimerActive);