diff options
| author | Andrew Lee <anwlee@google.com> | 2014-05-27 23:21:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-27 23:21:20 +0000 |
| commit | 07f1374c8c60acadd8901c9eeaa91cd860fe957e (patch) | |
| tree | a9094f237b9c8f126aff7f2750f739f229006f13 | |
| parent | 8a0a73e688a6278ab2b55a36dc60846eaff6a9fd (diff) | |
| parent | 4d3540c5594f4330d46604dda1480bda707321ea (diff) | |
am 4d3540c5: Merge "Use custom path interpolators for dialpad slide in/out." into lmp-preview-dev
* commit '4d3540c5594f4330d46604dda1480bda707321ea':
Use custom path interpolators for dialpad slide in/out.
| -rw-r--r-- | res/anim/slide_in.xml | 2 | ||||
| -rw-r--r-- | res/anim/slide_out.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/res/anim/slide_in.xml b/res/anim/slide_in.xml index 9f9c4d4c7..56318e429 100644 --- a/res/anim/slide_in.xml +++ b/res/anim/slide_in.xml @@ -14,7 +14,7 @@ limitations under the License. --> <translate xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@android:interpolator/fast_out_slow_in" + android:interpolator="@interpolator/ease_in_interpolator" android:duration="666" android:fromYDelta="67%p" android:toYDelta="0" />
\ No newline at end of file diff --git a/res/anim/slide_out.xml b/res/anim/slide_out.xml index e77bcde06..1cd39a7a6 100644 --- a/res/anim/slide_out.xml +++ b/res/anim/slide_out.xml @@ -14,7 +14,7 @@ limitations under the License. --> <translate xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@android:interpolator/fast_out_slow_in" + android:interpolator="@interpolator/ease_out_interpolator" android:duration="429" android:fromYDelta="0" android:toYDelta="80%p" />
\ No newline at end of file |