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

am 50b15348: Merge "Bug 5312828 - Menu button not responding" into ics-mr0

Browse Source 
* commit '50b15348c5b61472b5ed02434968b5a035765b63':
  Bug 5312828 - Menu button not responding
This commit is contained in:
Adam Powell
2011-10-13 16:15:17 -07:00
committed by Android Git Automerger
parent 3fda6ed3c7 50b15348c5
commit fb99c53308
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
policy/src/com/android/internal/policy/impl/PhoneWindow.java
View File

@@ -349,8 +349,9 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
} }
// Already prepared (isPrepared will be reset to false later) // Already prepared (isPrepared will be reset to false later)
if (st.isPrepared) if (st.isPrepared) {
return true; return true;
}
if ((mPreparedPanel != null) && (mPreparedPanel != st)) { if ((mPreparedPanel != null) && (mPreparedPanel != st)) {
// Another Panel is prepared and possibly open, so close it // Another Panel is prepared and possibly open, so close it
@@ -800,14 +801,23 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
closePanel(st, true); closePanel(st, true);
} else if (st.isPrepared) { } 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);
}
// Write 'menu opened' to event log if (show) {
EventLog.writeEvent(50001, 0); // Write 'menu opened' to event log
EventLog.writeEvent(50001, 0);
// Show menu // Show menu
openPanel(st, event); openPanel(st, event);
playSoundEffect = true; playSoundEffect = true;
}
} }
} }