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
diff --git a/src/com/android/browser/ScrollWebView.java b/src/com/android/browser/ScrollWebView.java
index 2ee2ac0..8c89e51 100644
--- a/src/com/android/browser/ScrollWebView.java
+++ b/src/com/android/browser/ScrollWebView.java
@@ -18,7 +18,6 @@
import android.content.Context;
import android.graphics.Bitmap;
-import android.graphics.Paint;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.view.View;
@@ -36,9 +35,7 @@
private boolean mBackgroundRemoved = false;
private boolean mUserInitiated = false;
private TitleBarBase mTitleBar;
- private boolean mDrawCached = false;
private Bitmap mBitmap;
- private Paint mCachePaint = new Paint();
/**
* @param context
@@ -137,46 +134,22 @@
mScrollListener = l;
}
- @Override
- public void invalidate() {
- if (!mDrawCached) {
- super.invalidate();
- }
- }
-
// callback for scroll events
interface ScrollListener {
public void onScroll(int visibleTitleHeight, boolean userInitiated);
}
- void setDrawCached(boolean cached) {
- if (cached == mDrawCached) return;
- if (cached) {
- buildDrawingCache();
- mBitmap = getDrawingCache(false);
- mDrawCached = (mBitmap != null);
- } else {
- mDrawCached = false;
- mBitmap = null;
- destroyDrawingCache();
- }
- }
-
@Override
protected void onDraw(android.graphics.Canvas c) {
- if (mDrawCached) {
- c.drawBitmap(mBitmap, getScrollX(), getScrollY(), mCachePaint);
- } else {
- super.onDraw(c);
- if (!mBackgroundRemoved && getRootView().getBackground() != null) {
- mBackgroundRemoved = true;
- post(new Runnable() {
- public void run() {
- getRootView().setBackgroundDrawable(null);
- }
- });
- }
+ super.onDraw(c);
+ if (!mBackgroundRemoved && getRootView().getBackground() != null) {
+ mBackgroundRemoved = true;
+ post(new Runnable() {
+ public void run() {
+ getRootView().setBackgroundDrawable(null);
+ }
+ });
}
}