diff options
| author | Yorke Lee <yorkelee@google.com> | 2014-06-20 19:27:53 +0000 |
|---|---|---|
| committer | Yorke Lee <yorkelee@google.com> | 2014-06-20 19:27:53 +0000 |
| commit | 4aac9d221bd23ae582e44064ffcadc90d06b220d (patch) | |
| tree | 99ba08066620c6cb6aba2c715cbf3eeb311cace2 /src/com/android/phone/common/animation | |
| parent | c4a7bd9be54759105c0a9ea235ac5bda2c1b3f8f (diff) | |
| download | packages_apps_PhoneCommon-4aac9d221bd23ae582e44064ffcadc90d06b220d.tar.gz packages_apps_PhoneCommon-4aac9d221bd23ae582e44064ffcadc90d06b220d.tar.bz2 packages_apps_PhoneCommon-4aac9d221bd23ae582e44064ffcadc90d06b220d.zip | |
Revert "Update Emergency Dialer to match Dialer (5/5)."
This reverts commit c4a7bd9be54759105c0a9ea235ac5bda2c1b3f8f.
Change-Id: I9a81515783de2ab534a611c777f10b9376ca3b7a
Diffstat (limited to 'src/com/android/phone/common/animation')
| -rw-r--r-- | src/com/android/phone/common/animation/AnimUtils.java | 108 | ||||
| -rw-r--r-- | src/com/android/phone/common/animation/AnimationListenerAdapter.java | 48 |
2 files changed, 0 insertions, 156 deletions
diff --git a/src/com/android/phone/common/animation/AnimUtils.java b/src/com/android/phone/common/animation/AnimUtils.java deleted file mode 100644 index 35ac107..0000000 --- a/src/com/android/phone/common/animation/AnimUtils.java +++ /dev/null @@ -1,108 +0,0 @@ -/* - * 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 - */ - -package com.android.phone.common.animation; - -import android.animation.Animator; -import android.animation.AnimatorListenerAdapter; -import android.view.View; -import android.view.ViewPropertyAnimator; -import android.view.animation.Interpolator; -import android.view.animation.PathInterpolator; - -public class AnimUtils { - public static final int DEFAULT_DURATION = -1; - public static final Interpolator EASE_IN = new PathInterpolator(0.0f, 0.0f, 0.2f, 1.0f); - public static final Interpolator EASE_OUT = new PathInterpolator(0.4f, 0.0f, 1.0f, 1.0f); - public static final Interpolator EASE_OUT_EASE_IN = new PathInterpolator(0.4f, 0, 0.2f, 1); - - public static class AnimationCallback { - public void onAnimationEnd() {} - public void onAnimationCancel() {} - } - - public static void crossFadeViews(View fadeIn, View fadeOut, int duration) { - fadeIn(fadeIn, duration); - fadeOut(fadeOut, duration); - } - - public static void fadeOut(View fadeOut, int duration) { - fadeOut(fadeOut, duration, null); - } - - public static void fadeOut(final View fadeOut, int duration, final AnimationCallback callback) { - fadeOut.setAlpha(1); - final ViewPropertyAnimator animator = fadeOut.animate(); - animator.cancel(); - animator.alpha(0).withLayer().setListener(new AnimatorListenerAdapter() { - @Override - public void onAnimationEnd(Animator animation) { - fadeOut.setVisibility(View.GONE); - if (callback != null) { - callback.onAnimationEnd(); - } - } - - @Override - public void onAnimationCancel(Animator animation) { - fadeOut.setVisibility(View.GONE); - fadeOut.setAlpha(0); - if (callback != null) { - callback.onAnimationCancel(); - } - } - }); - if (duration != DEFAULT_DURATION) { - animator.setDuration(duration); - } - animator.start(); - } - - public static void fadeIn(View fadeIn, int duration) { - fadeIn(fadeIn, duration, null); - } - - public static void fadeIn(final View fadeIn, int duration, final AnimationCallback callback) { - fadeIn.setAlpha(0); - final ViewPropertyAnimator animator = fadeIn.animate(); - animator.cancel(); - animator.alpha(1).withLayer().setListener(new AnimatorListenerAdapter() { - @Override - public void onAnimationStart(Animator animation) { - fadeIn.setVisibility(View.VISIBLE); - } - - @Override - public void onAnimationCancel(Animator animation) { - fadeIn.setAlpha(1); - if (callback != null) { - callback.onAnimationCancel(); - } - } - - @Override - public void onAnimationEnd(Animator animation) { - if (callback != null) { - callback.onAnimationEnd(); - } - } - }); - if (duration != DEFAULT_DURATION) { - animator.setDuration(duration); - } - animator.start(); - } -} diff --git a/src/com/android/phone/common/animation/AnimationListenerAdapter.java b/src/com/android/phone/common/animation/AnimationListenerAdapter.java deleted file mode 100644 index d8f3fa6..0000000 --- a/src/com/android/phone/common/animation/AnimationListenerAdapter.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * 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 - */ - -package com.android.phone.common.animation; - -import android.view.animation.Animation; -import android.view.animation.Animation.AnimationListener; - -/** - * Provides empty implementations of the methods in {@link AnimationListener} - * for convenience reasons. - */ -public class AnimationListenerAdapter implements AnimationListener { - - /** - * {@inheritDoc} - */ - @Override - public void onAnimationStart(Animation animation) { - } - - /** - * {@inheritDoc} - */ - @Override - public void onAnimationEnd(Animation animation) { - } - - /** - * {@inheritDoc} - */ - @Override - public void onAnimationRepeat(Animation animation) { - } -} |
