diff options
author | Sai Cheemalapati <saicheems@google.com> | 2014-06-03 13:54:23 -0700 |
---|---|---|
committer | Sai Cheemalapati <saicheems@google.com> | 2014-06-03 14:49:19 -0700 |
commit | 82d6da53d993bb3a5cabf7c9f5f0c0e62488c15f (patch) | |
tree | d43f4331bab66605dd59428c5077f06567675a9f /res | |
parent | 1e61380222440bb53a46a05907914207ce282386 (diff) |
Updated dialer animation in landscape.
Caching animations in constructor.
Dialer now flows in and out from/to the right.
Moved animation timing constants to constants file.
Change-Id: I287caa081c6576b347594d30ccce2b6d6526db1f
Diffstat (limited to 'res')
-rw-r--r-- | res/anim/slide_in.xml | 4 | ||||
-rw-r--r-- | res/anim/slide_in_right.xml | 21 | ||||
-rw-r--r-- | res/anim/slide_out.xml | 4 | ||||
-rw-r--r-- | res/anim/slide_out_right.xml | 21 | ||||
-rw-r--r-- | res/values/animation_constants.xml | 2 |
5 files changed, 48 insertions, 4 deletions
diff --git a/res/anim/slide_in.xml b/res/anim/slide_in.xml index b0eed3713..fa0bda02a 100644 --- a/res/anim/slide_in.xml +++ b/res/anim/slide_in.xml @@ -15,6 +15,6 @@ --> <translate xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@interpolator/ease_in_interpolator" - android:duration="532" + android:duration="@integer/dialpad_slide_in_duration" android:fromYDelta="67%p" - android:toYDelta="0" />
\ No newline at end of file + android:toYDelta="0" /> diff --git a/res/anim/slide_in_right.xml b/res/anim/slide_in_right.xml new file mode 100644 index 000000000..11b764a36 --- /dev/null +++ b/res/anim/slide_in_right.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (c) 2014, The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<translate xmlns:android="http://schemas.android.com/apk/res/android" + android:fromXDelta="67%p" + android:toXDelta="0" + android:interpolator="@android:anim/decelerate_interpolator" + android:duration="@integer/dialpad_slide_in_duration"/> diff --git a/res/anim/slide_out.xml b/res/anim/slide_out.xml index 231555e88..e5d7ed4b9 100644 --- a/res/anim/slide_out.xml +++ b/res/anim/slide_out.xml @@ -15,6 +15,6 @@ --> <translate xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@interpolator/ease_out_interpolator" - android:duration="257" + android:duration="@integer/dialpad_slide_out_duration" android:fromYDelta="0" - android:toYDelta="80%p" />
\ No newline at end of file + android:toYDelta="80%p" /> diff --git a/res/anim/slide_out_right.xml b/res/anim/slide_out_right.xml new file mode 100644 index 000000000..72304a4b2 --- /dev/null +++ b/res/anim/slide_out_right.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (c) 2014, The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<translate xmlns:android="http://schemas.android.com/apk/res/android" + android:fromXDelta="0" + android:toXDelta="80%" + android:interpolator="@android:anim/decelerate_interpolator" + android:duration="@integer/dialpad_slide_out_duration"/> diff --git a/res/values/animation_constants.xml b/res/values/animation_constants.xml index 786306092..05b8e218d 100644 --- a/res/values/animation_constants.xml +++ b/res/values/animation_constants.xml @@ -16,6 +16,8 @@ --> <resources> <integer name="fade_duration">300</integer> + <integer name="dialpad_slide_in_duration">532</integer> + <integer name="dialpad_slide_out_duration">257</integer> <!-- Swipe constants --> <integer name="swipe_escape_velocity">100</integer> |