Merge "wm: Simplify menu action decision paths" into cm-11.0 (0593fe17) · Commits · e / os / android_frameworks_base

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

+8 −23

Original line number	Original line	Diff line number	Diff line
	@@ -2623,7 +2623,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
	if (mEnableShiftMenuBugReports && (metaState & chordBug) == chordBug) {		if (mEnableShiftMenuBugReports && (metaState & chordBug) == chordBug) {
	Intent intent = new Intent(Intent.ACTION_BUG_REPORT);		Intent intent = new Intent(Intent.ACTION_BUG_REPORT);
	mContext.sendOrderedBroadcast(intent, null);		mContext.sendOrderedBroadcast(intent, null);
	return -1;
	} else if (SHOW_PROCESSES_ON_ALT_MENU &&		} else if (SHOW_PROCESSES_ON_ALT_MENU &&
	(metaState & KeyEvent.META_ALT_ON) == KeyEvent.META_ALT_ON) {		(metaState & KeyEvent.META_ALT_ON) == KeyEvent.META_ALT_ON) {
	Intent service = new Intent();		Intent service = new Intent();
	@@ -2638,8 +2637,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
	}		}
	Settings.System.putInt(		Settings.System.putInt(
	res, Settings.System.SHOW_PROCESSES, shown ? 0 : 1);		res, Settings.System.SHOW_PROCESSES, shown ? 0 : 1);
	return -1;
	}		}
			return -1;
	} else if (longPress) {		} else if (longPress) {
	if (mLongPressOnMenuBehavior != KEY_ACTION_NOTHING) {		if (mLongPressOnMenuBehavior != KEY_ACTION_NOTHING) {
	if (mLongPressOnMenuBehavior != KEY_ACTION_APP_SWITCH) {		if (mLongPressOnMenuBehavior != KEY_ACTION_APP_SWITCH) {
	@@ -2653,7 +2652,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
	}		}
	}		}
	}		}
	if (mPressOnMenuBehavior != KEY_ACTION_MENU) {
	if (!down && mMenuPressed) {		if (!down && mMenuPressed) {
	mMenuPressed = false;		mMenuPressed = false;
	if (mPressOnMenuBehavior != KEY_ACTION_APP_SWITCH) {		if (mPressOnMenuBehavior != KEY_ACTION_APP_SWITCH) {
	@@ -2664,19 +2662,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
	}		}
	}		}
	return -1;		return -1;
	} else {
	if (!down) {
	if (mMenuPressed) {
	mMenuPressed = false;
	cancelPreloadRecentApps();
	performKeyAction(mPressOnMenuBehavior);
	} else if (mLongPressOnMenuBehavior != KEY_ACTION_NOTHING) {
	return -1;
	}
	} else {
	return -1;
	}
	}
	} else if (keyCode == KeyEvent.KEYCODE_SEARCH) {		} else if (keyCode == KeyEvent.KEYCODE_SEARCH) {
	if (down) {		if (down) {
	if (repeatCount == 0) {		if (repeatCount == 0) {