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

Fix bug 5080988 - State change to action views made in

Browse Source 
onPrepareOptionsMenu will be lost

Change the ordering of restoring action views. Restoration now comes
after onCreate but before onPrepare in the menu setup rather than
after both. This allows apps to mutate the restored state in
onPrepare.

Change-Id: I822a716415d01112eb517ac093eaf6929f041aad
This commit is contained in:
Adam Powell
2011-08-09 17:15:48 -07:00
parent 95b0292fb4
commit 97a30017a4
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -392,6 +392,14 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
// Preparing the panel menu can involve a lot of manipulation;
// don't dispatch change events to presenters until we're done.
st.menu.stopDispatchingItemsChanged();
// Restore action view state before we prepare. This gives apps
// an opportunity to override frozen/restored state in onPrepare.
if (st.frozenActionViewState != null) {
st.menu.restoreActionViewStates(st.frozenActionViewState);
st.frozenActionViewState = null;
}
if (!cb.onPreparePanel(st.featureId, st.createdPanelView, st.menu)) {
st.menu.startDispatchingItemsChanged();
return false;
@@ -410,11 +418,6 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
st.isHandled = false;
mPreparedPanel = st;
if (st.frozenActionViewState != null) {
st.menu.restoreActionViewStates(st.frozenActionViewState);
st.frozenActionViewState = null;
}
return true;
}