summaryrefslogtreecommitdiffstats
path: root/core/java/com
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2010-11-15 16:49:35 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-11-15 16:49:35 -0800
commitc028a5ee7e6998f8ab0239baf91634eadad021e8 (patch)
treee33727598331f27ef39eee4697aa45a5c0b2e63c /core/java/com
parentb86c89c1a1070a076fcfec8e9bf743245a996d8b (diff)
parent8d12e201626239291fe2c4b31f97f2a14f01dea9 (diff)
downloadframeworks_base-c028a5ee7e6998f8ab0239baf91634eadad021e8.zip
frameworks_base-c028a5ee7e6998f8ab0239baf91634eadad021e8.tar.gz
frameworks_base-c028a5ee7e6998f8ab0239baf91634eadad021e8.tar.bz2
Merge "Fix a couple interactions between action bar and options menus"
Diffstat (limited to 'core/java/com')
-rw-r--r--core/java/com/android/internal/widget/ActionBarView.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/com/android/internal/widget/ActionBarView.java b/core/java/com/android/internal/widget/ActionBarView.java
index 0a4f543..e18f58f 100644
--- a/core/java/com/android/internal/widget/ActionBarView.java
+++ b/core/java/com/android/internal/widget/ActionBarView.java
@@ -40,6 +40,7 @@ import android.view.Menu;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewParent;
+import android.view.Window;
import android.widget.AdapterView;
import android.widget.HorizontalScrollView;
import android.widget.ImageView;
@@ -219,7 +220,7 @@ public class ActionBarView extends ViewGroup {
Context context = getContext();
if (context instanceof Activity) {
Activity activity = (Activity) context;
- activity.onOptionsItemSelected(mLogoNavItem);
+ activity.onMenuItemSelected(Window.FEATURE_OPTIONS_PANEL, mLogoNavItem);
}
}
});