diff options
| author | Yorke Lee <yorkelee@google.com> | 2014-08-06 20:40:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-05 00:35:13 +0000 |
| commit | aafed14228405904e00cb187b52f8373ad6910ff (patch) | |
| tree | 1bd2279b565c1b530ca456dbb930700b7466a7fa | |
| parent | 624d9e3ea71b6777fa3bcfa03ea68c60b0e7e6cb (diff) | |
| parent | 7cde80445d5e237ed4b1b6795f68b9f5b7eadeb8 (diff) | |
Merge "Set correct interpolator for dialpad animation" into lmp-dev
| -rw-r--r-- | InCallUI/src/com/android/incallui/InCallActivity.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/InCallUI/src/com/android/incallui/InCallActivity.java b/InCallUI/src/com/android/incallui/InCallActivity.java index 184a01023..b650e7beb 100644 --- a/InCallUI/src/com/android/incallui/InCallActivity.java +++ b/InCallUI/src/com/android/incallui/InCallActivity.java @@ -36,6 +36,7 @@ import android.view.Window; import android.view.WindowManager; import android.view.accessibility.AccessibilityEvent; +import com.android.phone.common.animation.AnimUtils; import com.android.phone.common.animation.AnimationListenerAdapter; import com.android.incallui.Call.State; @@ -118,6 +119,9 @@ public class InCallActivity extends Activity { mSlideOut = AnimationUtils.loadAnimation(this, mIsLandscape ? R.anim.dialpad_slide_out_right : R.anim.dialpad_slide_out_bottom); + mSlideIn.setInterpolator(AnimUtils.EASE_IN); + mSlideOut.setInterpolator(AnimUtils.EASE_OUT); + mSlideOut.setAnimationListener(mSlideOutListener); if (icicle != null) { if (icicle.getBoolean(SHOW_DIALPAD_EXTRA)) { |