diff options
| -rw-r--r-- | res/anim/slide_in.xml | 20 | ||||
| -rw-r--r-- | res/anim/slide_in_right.xml | 21 | ||||
| -rw-r--r-- | res/anim/slide_out.xml | 20 | ||||
| -rw-r--r-- | res/anim/slide_out_right.xml | 21 | ||||
| -rw-r--r-- | res/values/animation_constants.xml | 2 | ||||
| -rw-r--r-- | src/com/android/dialer/DialtactsActivity.java | 4 |
6 files changed, 2 insertions, 86 deletions
diff --git a/res/anim/slide_in.xml b/res/anim/slide_in.xml deleted file mode 100644 index fa0bda02a..000000000 --- a/res/anim/slide_in.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2013 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:interpolator="@interpolator/ease_in_interpolator" - android:duration="@integer/dialpad_slide_in_duration" - android:fromYDelta="67%p" - android:toYDelta="0" /> diff --git a/res/anim/slide_in_right.xml b/res/anim/slide_in_right.xml deleted file mode 100644 index 11b764a36..000000000 --- a/res/anim/slide_in_right.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?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 deleted file mode 100644 index e5d7ed4b9..000000000 --- a/res/anim/slide_out.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2013 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:interpolator="@interpolator/ease_out_interpolator" - android:duration="@integer/dialpad_slide_out_duration" - android:fromYDelta="0" - android:toYDelta="80%p" /> diff --git a/res/anim/slide_out_right.xml b/res/anim/slide_out_right.xml deleted file mode 100644 index 72304a4b2..000000000 --- a/res/anim/slide_out_right.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?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 05b8e218d..786306092 100644 --- a/res/values/animation_constants.xml +++ b/res/values/animation_constants.xml @@ -16,8 +16,6 @@ --> <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> diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java index 53e438d6d..7a94700c5 100644 --- a/src/com/android/dialer/DialtactsActivity.java +++ b/src/com/android/dialer/DialtactsActivity.java @@ -427,9 +427,9 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O } mSlideIn = AnimationUtils.loadAnimation(this, - mIsLandscape ? R.anim.slide_in_right : R.anim.slide_in); + mIsLandscape ? R.anim.dialpad_slide_in_right : R.anim.dialpad_slide_in_bottom); mSlideOut = AnimationUtils.loadAnimation(this, - mIsLandscape ? R.anim.slide_out_right : R.anim.slide_out); + mIsLandscape ? R.anim.dialpad_slide_out_right : R.anim.dialpad_slide_out_bottom); mSlideOut.setAnimationListener(mSlideOutListener); |