Fix dispatching of menu preparation to fragments.

kevinsawicki · Dec 29, 2011 · a3ef1ae · a3ef1ae
1 parent ddfa66d
commit a3ef1ae
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 15 deletions.
diff --git a/library/src/android/support/v4/app/FragmentActivity.java b/library/src/android/support/v4/app/FragmentActivity.java
@@ -918,11 +918,9 @@ public final boolean onPrepareOptionsMenu(android.view.Menu menu) {
     private boolean dispatchPrepareOptionsMenu() {
         if (DEBUG) Log.d(TAG, "[dispatchPrepareOptionsMenu]");
 
-        if (onPrepareOptionsMenu(mSupportMenu)) {
-            mFragments.dispatchPrepareOptionsMenu(mSupportMenu);
-            return true;
-        }
-        return false;
+        boolean result = onPrepareOptionsMenu(mSupportMenu);
+        result |= mFragments.dispatchPrepareOptionsMenu(mSupportMenu);
+        return result;
     }
 
     /**

diff --git a/plugins/maps/src/android/support/v4/app/FragmentMapActivity.java b/plugins/maps/src/android/support/v4/app/FragmentMapActivity.java
@@ -919,11 +919,9 @@ public final boolean onPrepareOptionsMenu(android.view.Menu menu) {
     private boolean dispatchPrepareOptionsMenu() {
         if (DEBUG) Log.d(TAG, "[dispatchPrepareOptionsMenu]");
 
-        if (onPrepareOptionsMenu(mSupportMenu)) {
-            mFragments.dispatchPrepareOptionsMenu(mSupportMenu);
-            return true;
-        }
-        return false;
+        boolean result = onPrepareOptionsMenu(mSupportMenu);
+        result |= mFragments.dispatchPrepareOptionsMenu(mSupportMenu);
+        return result;
     }
 
     /**

diff --git a/plugins/preference/src/android/support/v4/app/SherlockPreferenceActivity.java b/plugins/preference/src/android/support/v4/app/SherlockPreferenceActivity.java
@@ -919,11 +919,9 @@ public final boolean onPrepareOptionsMenu(android.view.Menu menu) {
     private boolean dispatchPrepareOptionsMenu() {
         if (DEBUG) Log.d(TAG, "[dispatchPrepareOptionsMenu]");
 
-        if (onPrepareOptionsMenu(mSupportMenu)) {
-            mFragments.dispatchPrepareOptionsMenu(mSupportMenu);
-            return true;
-        }
-        return false;
+        boolean result = onPrepareOptionsMenu(mSupportMenu);
+        result |= mFragments.dispatchPrepareOptionsMenu(mSupportMenu);
+        return result;
     }
 
     /**