summaryrefslogtreecommitdiffstats
path: root/policy
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2011-01-18 18:39:10 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-18 18:39:10 -0800
commiteb7a7a044adba95216152e848fa692ec2869e06b (patch)
treea9f0b99d7425f625a4970f7fa3cb420450beb724 /policy
parent246bd60efa89376918e5d4cd53d2ed4f9288bf8d (diff)
parent6cfc7a0acb0d3b202ae1dbee88e7e8bdfaee5590 (diff)
downloadframeworks_base-eb7a7a044adba95216152e848fa692ec2869e06b.zip
frameworks_base-eb7a7a044adba95216152e848fa692ec2869e06b.tar.gz
frameworks_base-eb7a7a044adba95216152e848fa692ec2869e06b.tar.bz2
am 6cfc7a0a: Merge "Fix bug 3365208 - Contextual Action Bar is not displayed when the context item is changing" into honeycomb
* commit '6cfc7a0acb0d3b202ae1dbee88e7e8bdfaee5590': Fix bug 3365208 - Contextual Action Bar is not displayed when the context item is changing
Diffstat (limited to 'policy')
-rw-r--r--policy/src/com/android/internal/policy/impl/PhoneWindow.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
index fb20e81..1d0b633 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
@@ -1985,6 +1985,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
}
if (mActionModeView != null) {
+ mActionModeView.killMode();
mode = new StandaloneActionMode(getContext(), mActionModeView, wrappedCallback);
if (callback.onCreateActionMode(mode, mode.getMenu())) {
mode.invalidate();