commit 1ab418a222e1834c4b1312fde355e41a1947af0d
author Adam Powell <adamp@google.com> Thu Jun 09 20:49:49 2011 -0700
committer Adam Powell <adamp@google.com> Thu Jun 09 21:01:56 2011 -0700
tree 17b9758e9896c71a73c0646f1f6d415a28651f67
parent aab49b40e8dd78aca67db160f5d0c787379c8f7f

Refine the behavior of split action bars.

Change-Id: I27212c7554025433ee366f0766971f0092b26d67

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 dda3be6..c3b1098 100644
--- a/core/java/com/android/internal/app/ActionBarImpl.java
+++ b/core/java/com/android/internal/app/ActionBarImpl.java
@@ -368,7 +368,7 @@
             mode.invalidate();
             mContextView.initForMode(mode);
             animateToMode(true);
-            if (mSplitView != null) {
+            if (mSplitView != null && mContextDisplayMode == CONTEXT_DISPLAY_SPLIT) {
                 // TODO animate this
                 mSplitView.setVisibility(View.VISIBLE);
             }
@@ -526,7 +526,7 @@
                 mContainerView.setTranslationY(-mContainerView.getHeight());
                 b.with(ObjectAnimator.ofFloat(mContainerView, "translationY", 0));
             }
-            if (mSplitView != null) {
+            if (mSplitView != null && mContextDisplayMode == CONTEXT_DISPLAY_SPLIT) {
                 mSplitView.setAlpha(0);
                 b.with(ObjectAnimator.ofFloat(mSplitView, "alpha", 1));
             }
@@ -560,7 +560,7 @@
                 b.with(ObjectAnimator.ofFloat(mContainerView, "translationY",
                         -mContainerView.getHeight()));
             }
-            if (mSplitView != null) {
+            if (mSplitView != null && mSplitView.getVisibility() == View.VISIBLE) {
                 mSplitView.setAlpha(1);
                 b.with(ObjectAnimator.ofFloat(mSplitView, "alpha", 0));
             }