Merge "Fix a bug in Activity Up navigation dispatching" into jb-dev

adamp · Android (Google) Code Review · commit e601efd375e7 · 2012-05-07T17:40:09.000-07:00
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
@@ -2540,11 +2540,10 @@ public boolean onMenuItemSelected(int featureId, MenuItem item) {
                 if (item.getItemId() == android.R.id.home && mActionBar != null &&
                         (mActionBar.getDisplayOptions() & ActionBar.DISPLAY_HOME_AS_UP) != 0) {
                     if (mParent == null) {
-                        onNavigateUp();
+                        return onNavigateUp();
                     } else {
-                        mParent.onNavigateUpFromChild(this);
+                        return mParent.onNavigateUpFromChild(this);
                     }
-                    return true;
                 }
                 return false;
                 

Original file line number	Diff line number	Diff line change
`@@ -2540,11 +2540,10 @@ public boolean onMenuItemSelected(int featureId, MenuItem item) {`
`2540`	`2540`	`if (item.getItemId() == android.R.id.home && mActionBar != null &&`
`2541`	`2541`	`(mActionBar.getDisplayOptions() & ActionBar.DISPLAY_HOME_AS_UP) != 0) {`
`2542`	`2542`	`if (mParent == null) {`
`2543`		`- onNavigateUp();`
	`2543`	`+ return onNavigateUp();`
`2544`	`2544`	`} else {`
`2545`		`- mParent.onNavigateUpFromChild(this);`
	`2545`	`+ return mParent.onNavigateUpFromChild(this);`
`2546`	`2546`	`}`
`2547`		`- return true;`
`2548`	`2547`	`}`
`2549`	`2548`	`return false;`
`2550`	`2549`