commit 2bbad0cddce213ffd3d1e0909f2dc74dd0038ba7
author Yigit Boyar <yboyar@google.com> Tue Sep 16 18:28:03 2014 -0700
committer Yigit Boyar <yboyar@google.com> Tue Sep 16 18:28:03 2014 -0700
tree 3fc91c3a6faf01e588c1b19bdd823e2de43f0545
parent 1dd9048b3ffc8380e9ce63c8e627499a8402d71a

Handle action mode changes properly for actionbar tabs

Bug: 17513613
Change-Id: I4ebcadc618558153b72bf577232adc3e616adb6b

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

diff --git a/core/java/com/android/internal/app/WindowDecorActionBar.java b/core/java/com/android/internal/app/WindowDecorActionBar.java
index a8f7bb3..2377c22 100644
--- a/core/java/com/android/internal/app/WindowDecorActionBar.java
+++ b/core/java/com/android/internal/app/WindowDecorActionBar.java
@@ -866,14 +866,7 @@
 
         mDecorToolbar.animateToVisibility(toActionMode ? View.GONE : View.VISIBLE);
         mContextView.animateToVisibility(toActionMode ? View.VISIBLE : View.GONE);
-        if (mTabScrollView != null && !mDecorToolbar.hasEmbeddedTabs() &&
-                isCollapsed(mDecorToolbar.getViewGroup())) {
-            mTabScrollView.animateToVisibility(toActionMode ? View.GONE : View.VISIBLE);
-        }
-    }
-
-    private boolean isCollapsed(View view) {
-        return view == null || view.getVisibility() == View.GONE || view.getMeasuredHeight() == 0;
+        // mTabScrollView's visibility is not affected by action mode.
     }
 
     public Context getThemedContext() {