commit 8616937c50df2b77b04db4c1e90780d0c8ff3d38
author Chris Banes <chrisbanes@google.com> Fri Sep 05 13:13:36 2014 +0100
committer Chris Banes <chrisbanes@google.com> Fri Sep 05 13:13:36 2014 +0100
tree e7ceb520871f1105c2fc8defdea1024bbc0924f8
parent 04fb3ec5e903db1032ba06db163d128928c06393

Don't show list menu when an action mode is displayed

BUG: 17049242
Change-Id: I47335e47ba6dd5c1eb3e21785d7dd03b638acf60

v7/appcompat/src/android/support/v7/app/ActionBarActivityDelegateBase.java

diff --git a/v7/appcompat/src/android/support/v7/app/ActionBarActivityDelegateBase.java b/v7/appcompat/src/android/support/v7/app/ActionBarActivityDelegateBase.java
index c1eb6b1..3128b77 100644
--- a/v7/appcompat/src/android/support/v7/app/ActionBarActivityDelegateBase.java
+++ b/v7/appcompat/src/android/support/v7/app/ActionBarActivityDelegateBase.java
@@ -379,7 +379,7 @@
     public View onCreatePanelView(int featureId) {
         View createdPanelView = null;
 
-        if (featureId == Window.FEATURE_OPTIONS_PANEL && preparePanel()) {
+        if (featureId == Window.FEATURE_OPTIONS_PANEL && mActionMode == null && preparePanel()) {
             createdPanelView = (View) getListMenuView(mActivity);
         }