am 1d026495: Merge "Add fadeIn and fadeOut methods to AnimUtils" into lmp-preview-dev
* commit '1d026495660b85d62a035c77c947a9729f49e92a':
Add fadeIn and fadeOut methods to AnimUtils
diff --git a/src/com/android/contacts/common/animation/AnimUtils.java b/src/com/android/contacts/common/animation/AnimUtils.java
new file mode 100644
index 0000000..6872afb
--- /dev/null
+++ b/src/com/android/contacts/common/animation/AnimUtils.java
@@ -0,0 +1,64 @@
+/*
+ * 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.contacts.common.animation;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.view.View;
+import android.view.ViewPropertyAnimator;
+
+public class AnimUtils {
+ public static void crossFadeViews(final View fadeIn, final View fadeOut, int duration) {
+ fadeIn(fadeIn, duration);
+ fadeOut(fadeOut, duration);
+ }
+
+ public static void fadeOut(final View fadeOut, int duration) {
+ 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);
+ }
+
+ @Override
+ public void onAnimationCancel(Animator animation) {
+ fadeOut.setVisibility(View.GONE);
+ fadeOut.setAlpha(0);
+ }
+ }).setDuration(duration).start();
+ }
+
+ public static void fadeIn(final View fadeIn, int duration) {
+ 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);
+ }
+ }).setDuration(duration).start();
+ }
+}
diff --git a/src/com/android/contacts/common/animation/AnimationUtils.java b/src/com/android/contacts/common/animation/AnimationUtils.java
deleted file mode 100644
index 58c5128..0000000
--- a/src/com/android/contacts/common/animation/AnimationUtils.java
+++ /dev/null
@@ -1,53 +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.contacts.common.animation;
-
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.view.View;
-
-public class AnimationUtils {
- public static void crossFadeViews(final View fadeIn, final View fadeOut, int duration) {
- fadeOut.animate().cancel();
- fadeOut.animate().alpha(0).withLayer().setDuration(duration)
- .setListener(new AnimatorListenerAdapter() {
- @Override
- public void onAnimationEnd(Animator animation) {
- fadeOut.setVisibility(View.GONE);
- }
-
- @Override
- public void onAnimationCancel(Animator animation) {
- fadeOut.setVisibility(View.GONE);
- fadeOut.setAlpha(0);
- }
- }).start();
- fadeIn.animate().cancel();
- fadeIn.animate().alpha(1).setDuration(duration).withLayer().setListener(
- new AnimatorListenerAdapter() {
- @Override
- public void onAnimationStart(Animator animation) {
- fadeIn.setVisibility(View.VISIBLE);
- }
-
- @Override
- public void onAnimationCancel(Animator animation) {
- fadeIn.setAlpha(1);
- }
- }).start();
- }
-}