Merge "Null check for fade start alpha value." into nyc-dev (a096e57e) · Commits · e / os / android_frameworks_base

core/java/android/transition/Fade.java

+16 −11

Original line number	Diff line number	Diff line
		@@ -16,8 +16,6 @@

		package android.transition;

		import com.android.internal.R;

		import android.animation.Animator;
		import android.animation.AnimatorListenerAdapter;
		import android.animation.ObjectAnimator;
		@@ -28,6 +26,8 @@ import android.util.Log;
		import android.view.View;
		import android.view.ViewGroup;

		import com.android.internal.R;

		/**
		* This transition tracks changes to the visibility of target views in the
		* start and end scenes and fades views in or out when they become visible
		@@ -144,24 +144,29 @@ public class Fade extends Visibility {
		Log.d(LOG_TAG, "Fade.onAppear: startView, startVis, endView, endVis = " +
		startView + ", " + view);
		}
		float startAlpha = 0;
		if (startValues != null) {
		startAlpha = (Float) startValues.values.get(PROPNAME_TRANSITION_ALPHA);
		float startAlpha = getStartAlpha(startValues, 0);
		if (startAlpha == 1) {
		startAlpha = 0;
		}
		}
		return createAnimation(view, startAlpha, 1);
		}

		@Override
		public Animator onDisappear(ViewGroup sceneRoot, final View view, TransitionValues startValues,
		TransitionValues endValues) {
		float startAlpha = 1;
		float startAlpha = getStartAlpha(startValues, 1);
		return createAnimation(view, startAlpha, 0);
		}

		private static float getStartAlpha(TransitionValues startValues, float fallbackValue) {
		float startAlpha = fallbackValue;
		if (startValues != null) {
		startAlpha = (Float) startValues.values.get(PROPNAME_TRANSITION_ALPHA);
		Float startAlphaFloat = (Float) startValues.values.get(PROPNAME_TRANSITION_ALPHA);
		if (startAlphaFloat != null) {
		startAlpha = startAlphaFloat;
		}
		return createAnimation(view, startAlpha, 0);
		}
		return startAlpha;
		}

		private static class FadeAnimatorListener extends AnimatorListenerAdapter {