Turn off the focus animation (fbf9cf8d) · Commits · e / os / android_frameworks_base

core/java/android/webkit/WebView.java

+16 −5

Original line number	Original line	Diff line number	Diff line
	@@ -9212,12 +9212,22 @@ public class WebView extends AbsoluteLayout
	}		}
	};		};

			private boolean shouldAnimateTo(WebKitHitTest hit) {
			// TODO: Don't be annoying or throw out the animation entirely
			return false;
			}

	private void setTouchHighlightRects(WebKitHitTest hit) {		private void setTouchHighlightRects(WebKitHitTest hit) {
	FocusTransitionDrawable transition = new FocusTransitionDrawable(this);		FocusTransitionDrawable transition = null;
			if (shouldAnimateTo(hit)) {
			transition = new FocusTransitionDrawable(this);
			}
	Rect[] rects = hit != null ? hit.mTouchRects : null;		Rect[] rects = hit != null ? hit.mTouchRects : null;
	if (!mTouchHighlightRegion.isEmpty()) {		if (!mTouchHighlightRegion.isEmpty()) {
	invalidate(mTouchHighlightRegion.getBounds());		invalidate(mTouchHighlightRegion.getBounds());
			if (transition != null) {
	transition.mPreviousRegion = new Region(mTouchHighlightRegion);		transition.mPreviousRegion = new Region(mTouchHighlightRegion);
			}
	mTouchHighlightRegion.setEmpty();		mTouchHighlightRegion.setEmpty();
	}		}
	if (rects != null) {		if (rects != null) {
	@@ -9236,11 +9246,12 @@ public class WebView extends AbsoluteLayout
	+ viewRect);		+ viewRect);
	}		}
	}		}
	transition.mNewRegion = new Region(mTouchHighlightRegion);
	invalidate(mTouchHighlightRegion.getBounds());		invalidate(mTouchHighlightRegion.getBounds());
	if (hit.mHasFocus && transition.mPreviousRegion != null) {		if (transition != null && transition.mPreviousRegion != null) {
			transition.mNewRegion = new Region(mTouchHighlightRegion);
	mFocusTransition = transition;		mFocusTransition = transition;
	ObjectAnimator animator = ObjectAnimator.ofFloat(mFocusTransition, "progress", 1f);		ObjectAnimator animator = ObjectAnimator.ofFloat(
			mFocusTransition, "progress", 1f);
	animator.start();		animator.start();
	}		}
	}		}