commit 01feaee3d9767ef1185783877e92244f14d7d4ba
author Adam Powell <adamp@google.com> Thu Feb 10 15:05:05 2011 -0800
committer Adam Powell <adamp@google.com> Thu Feb 10 15:05:05 2011 -0800
tree 2695fd467a3cf1a8da1f4997f6cb8104af1160b8
parent 360e40ef21791aa171a7b38547c1101daf349b6a

Fix bug 3372468 - ActionBar menu shouldn't be clickable after
ActionBar.hide() is called

Action bar will capture touch events and prevent focus from passing to
its children while animating out.

Change-Id: I4501f785ead2afa34f020f9bc1a1121932f3c047

core/java/com/android/internal/app/ActionBarImpl.java

diff --git a/core/java/com/android/internal/app/ActionBarImpl.java b/core/java/com/android/internal/app/ActionBarImpl.java
index ab53adb..8f1354b 100644
--- a/core/java/com/android/internal/app/ActionBarImpl.java
+++ b/core/java/com/android/internal/app/ActionBarImpl.java
@@ -19,6 +19,7 @@
 import com.android.internal.view.menu.MenuBuilder;
 import com.android.internal.view.menu.MenuPopupHelper;
 import com.android.internal.view.menu.SubMenuBuilder;
+import com.android.internal.widget.ActionBarContainer;
 import com.android.internal.widget.ActionBarContextView;
 import com.android.internal.widget.ActionBarView;
 
@@ -65,7 +66,7 @@
     private Activity mActivity;
     private Dialog mDialog;
 
-    private FrameLayout mContainerView;
+    private ActionBarContainer mContainerView;
     private ActionBarView mActionView;
     private ActionBarContextView mUpperContextView;
     private LinearLayout mLowerContextView;
@@ -151,6 +152,7 @@
                 mContentView.setTranslationY(0);
             }
             mContainerView.setVisibility(View.GONE);
+            mContainerView.setTransitioning(false);
             mCurrentAnim = null;
         }
 
@@ -205,7 +207,7 @@
                 com.android.internal.R.id.action_context_bar);
         mLowerContextView = (LinearLayout) decor.findViewById(
                 com.android.internal.R.id.lower_action_context_bar);
-        mContainerView = (FrameLayout) decor.findViewById(
+        mContainerView = (ActionBarContainer) decor.findViewById(
                 com.android.internal.R.id.action_bar_container);
 
         if (mActionView == null || mUpperContextView == null || mContainerView == null) {
@@ -533,6 +535,7 @@
 
         if (mShowHideAnimationEnabled) {
             mContainerView.setAlpha(1);
+            mContainerView.setTransitioning(true);
             AnimatorSet anim = new AnimatorSet();
             AnimatorSet.Builder b = anim.play(ObjectAnimator.ofFloat(mContainerView, "alpha", 0));
             if (mContentView != null) {