1 files changed, 9 insertions, 24 deletions
diff --git a/src/com/android/browser/TabScrollView.java b/src/com/android/browser/TabScrollView.java
index 0d85920b3..7268ddcf4 100644
--- a/src/com/android/browser/TabScrollView.java
+++ b/src/com/android/browser/TabScrollView.java
@@ -18,6 +18,7 @@ package com.android.browser;
 
 import android.animation.Animator;
 import android.animation.Animator.AnimatorListener;
+import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
 import android.animation.PropertyValuesHolder;
 import android.content.Context;
@@ -171,44 +172,28 @@ public class TabScrollView extends HorizontalScrollView {
     }
 
     private void animateIn(View tab) {
-        ObjectAnimator animator = new ObjectAnimator<PropertyValuesHolder>(
-                mAnimationDuration, tab,
-                new PropertyValuesHolder<Integer>("TranslationX", 500, 0));
+        ObjectAnimator animator = ObjectAnimator.ofInt(tab, "TranslationX", 500, 0);
+        animator.setDuration(mAnimationDuration);
         animator.start();
     }
 
     private void animateOut(final View tab) {
-        ObjectAnimator animator = new ObjectAnimator<PropertyValuesHolder>(
-                mAnimationDuration, tab,
-                new PropertyValuesHolder<Integer>("TranslationX", 0,
-                        getScrollX() - tab.getRight()));
-        animator.addListener(new AnimatorListener() {
-
-            @Override
-            public void onAnimationCancel(Animator animation) {
-            }
-
+        ObjectAnimator animator = ObjectAnimator.ofInt(
+                tab, "TranslationX", 0, getScrollX() - tab.getRight());
+        animator.setDuration(mAnimationDuration);
+        animator.addListener(new AnimatorListenerAdapter() {
             @Override
             public void onAnimationEnd(Animator animation) {
                 mContentView.removeView(tab);
             }
-
-            @Override
-            public void onAnimationRepeat(Animator animation) {
-            }
-
-            @Override
-            public void onAnimationStart(Animator animation) {
-            }
         });
         animator.setInterpolator(new AccelerateInterpolator());
         animator.start();
     }
 
     private void animateScroll(int newscroll) {
-        ObjectAnimator animator = new ObjectAnimator<PropertyValuesHolder>(
-                mAnimationDuration, this,
-                new PropertyValuesHolder<Integer>("scroll", getScrollX(), newscroll));
+        ObjectAnimator animator = ObjectAnimator.ofInt(this, "scroll", getScrollX(), newscroll);
+        animator.setDuration(mAnimationDuration);
         animator.start();
     }