commit f6ce6a9bacbb220c6ea7b552c481237f23e64ae7
author Adam Powell <adamp@google.com> Wed Jun 29 10:25:01 2011 -0700
committer Adam Powell <adamp@google.com> Thu Jun 30 13:55:19 2011 -0700
tree c692f5b4e00bd09d6ad017aa87b0ca5622e0afcb
parent 8ef7358fb3039765b98df170fea4307935145305

Fix some issues with the action bar and action modes.

Fix bug 4976004 - bad title measurement for split action modes

Fix bug 4902960 - action modes leaving a hidden action bar in a bad state

Sync with design for the behavior of various permutations of action
bar configuration + modes.

Change-Id: Id75f6b5911b761fabc5fef2cc2600ce197cf9a92

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 8d5df6f..519acf5 100644
--- a/core/java/com/android/internal/app/ActionBarImpl.java
+++ b/core/java/com/android/internal/app/ActionBarImpl.java
@@ -16,7 +16,6 @@
 
 package com.android.internal.app;
 
-import com.android.internal.R;
 import com.android.internal.view.menu.MenuBuilder;
 import com.android.internal.view.menu.MenuPopupHelper;
 import com.android.internal.view.menu.SubMenuBuilder;
@@ -36,7 +35,6 @@
 import android.app.FragmentTransaction;
 import android.content.Context;
 import android.content.res.Configuration;
-import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
 import android.os.Handler;
 import android.view.ActionMode;
@@ -580,6 +578,9 @@
 
         mActionView.animateToVisibility(toActionMode ? View.GONE : View.VISIBLE);
         mContextView.animateToVisibility(toActionMode ? View.VISIBLE : View.GONE);
+        if (mTabScrollView != null && !mActionView.hasEmbeddedTabs() && mActionView.isCollapsed()) {
+            mTabScrollView.animateToVisibility(toActionMode ? View.GONE : View.VISIBLE);
+        }
     }
 
     /**
@@ -620,6 +621,7 @@
 
             // Clear out the context mode views after the animation finishes
             mContextView.closeMode();
+
             mActionMode = null;
 
             if (mWasHiddenBeforeMode) {