Merge "Fix a bug with closing action bar context modes"

1 files changed, 5 insertions, 5 deletions

diff --git a/core/java/com/android/internal/widget/ActionBarContextView.java b/core/java/com/android/internal/widget/ActionBarContextView.java
index de3162a84b20..dcd05466caf4 100644
--- a/core/java/com/android/internal/widget/ActionBarContextView.java
+++ b/core/java/com/android/internal/widget/ActionBarContextView.java
@@ -140,12 +140,12 @@ public class ActionBarContextView extends ViewGroup {
             mCloseButton = new ImageButton(getContext());
             mCloseButton.setImageDrawable(mCloseDrawable);
             mCloseButton.setBackgroundDrawable(null);
-            mCloseButton.setOnClickListener(new OnClickListener() {
-                public void onClick(View v) {
-                    mode.finish();
-                }
-            });
         }
+        mCloseButton.setOnClickListener(new OnClickListener() {
+            public void onClick(View v) {
+                mode.finish();
+            }
+        });
         addView(mCloseButton);
 
         final MenuBuilder menu = (MenuBuilder) mode.getMenu();