commit f26289291f421f07396fa210574938e76e88a6dc
author Michael Kolb <kolby@google.com> Wed Mar 09 17:15:28 2011 -0800
committer Michael Kolb <kolby@google.com> Wed Mar 09 17:15:34 2011 -0800
tree cd268331fc534869869195cf60f01964963341cf
parent 208f1948017c10cccc52d97355f7fb79bbddc186

remove tab switch animation

       Bug: 4052162
       due to problems in webview rendering, the blending
       animation can cause some annoying flicker
       this change backs out the blending animation

Change-Id: I532fc01b79a6285f332a002c7515e759d377fd64

src/com/android/browser/XLargeUi.java

diff --git a/src/com/android/browser/XLargeUi.java b/src/com/android/browser/XLargeUi.java
index debb763..892b118 100644
--- a/src/com/android/browser/XLargeUi.java
+++ b/src/com/android/browser/XLargeUi.java
@@ -18,14 +18,9 @@
 
 import com.android.browser.ScrollWebView.ScrollListener;
 
-import android.animation.Animator;
-import android.animation.Animator.AnimatorListener;
-import android.animation.ObjectAnimator;
 import android.app.ActionBar;
 import android.app.Activity;
 import android.content.pm.PackageManager;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
 import android.os.Bundle;
 import android.os.Handler;
 import android.util.Log;
@@ -54,7 +49,6 @@
 
     private boolean mUseQuickControls;
     private PieControl mPieControl;
-    private boolean mInAnimation = false;
     private Handler mHandler;
 
     /**
@@ -221,56 +215,8 @@
 
     @Override
     public void setActiveTab(final Tab tab) {
-        if (mInAnimation) return;
-        if ((tab != mActiveTab) && (mActiveTab != null)) {
-            mInAnimation = true;
-            // animate between the two
-            final ScrollWebView fromWV = (ScrollWebView) mActiveTab.getWebView();
-            fromWV.setDrawCached(true);
-            fromWV.setEmbeddedTitleBar(null);
-            final ScrollWebView toWV = (ScrollWebView) tab.getWebView();
-            if (!mUseQuickControls) {
-                if (mTitleBar.getParent() == null) {
-                    toWV.setEmbeddedTitleBar(mTitleBar);
-                }
-            }
-            toWV.setDrawCached(true);
-            attachTabToContentView(tab);
-            super.setActiveTab(tab, false);
-            ObjectAnimator transition = ObjectAnimator.ofFloat(
-                    toWV, "alpha", 0f, 1f);
-            transition.setDuration(mActivity.getResources()
-                    .getInteger(R.integer.tabFadeDuration));
-            transition.addListener(new AnimatorListener() {
-                @Override
-                public void onAnimationCancel(Animator animation) {
-                    fromWV.setDrawCached(false);
-                    toWV.setDrawCached(false);
-                    setActiveTab(tab, false);
-                    mInAnimation = false;
-                }
-
-                @Override
-                public void onAnimationEnd(Animator animation) {
-                    fromWV.setDrawCached(false);
-                    toWV.setDrawCached(false);
-                    setActiveTab(tab, false);
-                    mInAnimation = false;
-                }
-
-                @Override
-                public void onAnimationRepeat(Animator animation) {
-                }
-
-                @Override
-                public void onAnimationStart(Animator animation) {
-                }
-            });
-            transition.start();
-        } else {
-            super.setActiveTab(tab, true);
-            setActiveTab(tab, true);
-        }
+        super.setActiveTab(tab, true);
+        setActiveTab(tab, true);
     }
 
     @Override