Merge "Bug 5312828 - Menu button not responding" into ics-mr0 (50b15348) · Commits · e / os / android_frameworks_base

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

+16 −6

Original line number	Diff line number	Diff line
		@@ -349,8 +349,9 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
		}

		// Already prepared (isPrepared will be reset to false later)
		if (st.isPrepared)
		if (st.isPrepared) {
		return true;
		}

		if ((mPreparedPanel != null) && (mPreparedPanel != st)) {
		// Another Panel is prepared and possibly open, so close it
		@@ -800,7 +801,15 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
		closePanel(st, true);

		} else if (st.isPrepared) {
		boolean show = true;
		if (st.refreshMenuContent) {
		// Something may have invalidated the menu since we prepared it.
		// Re-prepare it to refresh.
		st.isPrepared = false;
		show = preparePanel(st, event);
		}

		if (show) {
		// Write 'menu opened' to event log
		EventLog.writeEvent(50001, 0);

		@@ -810,6 +819,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
		playSoundEffect = true;
		}
		}
		}

		if (playSoundEffect) {
		AudioManager audioManager = (AudioManager) getContext().getSystemService(