commit 43dde103a7c616c4bdf421ea568b948d6a0225cb
author Justin Klaassen <justinklaassen@google.com> Thu Jun 12 16:54:04 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 12 16:54:04 2014 +0000
tree 6c7369ac98db8c072d74e9bd0a1ed0d20b1ba08f
parent 207dd9c6d385c47c6019464eacf7defaa95732b5
parent 94db720f7daf99923cc8e3d5ba8765b5529913f1

am 94db720f: Slow down text scale animation

* commit '94db720f7daf99923cc8e3d5ba8765b5529913f1':
  Slow down text scale animation

src/com/android/calculator2/CalculatorActivity.java

diff --git a/src/com/android/calculator2/CalculatorActivity.java b/src/com/android/calculator2/CalculatorActivity.java
index cd386eb..88f495d 100644
--- a/src/com/android/calculator2/CalculatorActivity.java
+++ b/src/com/android/calculator2/CalculatorActivity.java
@@ -248,7 +248,7 @@
                 ObjectAnimator.ofFloat(textView, View.SCALE_Y, textScale, 1.0f),
                 ObjectAnimator.ofFloat(textView, View.TRANSLATION_X, translationX, 0.0f),
                 ObjectAnimator.ofFloat(textView, View.TRANSLATION_Y, translationY, 0.0f));
-        animatorSet.setDuration(getResources().getInteger(android.R.integer.config_shortAnimTime));
+        animatorSet.setDuration(getResources().getInteger(android.R.integer.config_mediumAnimTime));
         animatorSet.setInterpolator(new AccelerateDecelerateInterpolator());
         animatorSet.start();
     }