Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Null check for fade start alpha value." into nyc-dev

Browse Source 
am: 21eb4e2684

* commit '21eb4e2684e8490deedab002dd2b867b6d35147a':
  Null check for fade start alpha value.
This commit is contained in:
George Mount
2016-02-16 15:26:51 +00:00
committed by android-build-merger
parent f056f6657c 21eb4e2684
commit a096e57ef5
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
core/java/android/transition/Fade.java
View File

@@ -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,12 +144,9 @@ 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);
if (startAlpha == 1) {
startAlpha = 0;
}
float startAlpha = getStartAlpha(startValues, 0);
if (startAlpha == 1) {
startAlpha = 0;
}
return createAnimation(view, startAlpha, 1);
}
@@ -157,13 +154,21 @@ public class Fade extends Visibility {
@Override
public Animator onDisappear(ViewGroup sceneRoot, final View view, TransitionValues startValues,
TransitionValues endValues) {
float startAlpha = 1;
if (startValues != null) {
startAlpha = (Float) startValues.values.get(PROPNAME_TRANSITION_ALPHA);
}
float startAlpha = getStartAlpha(startValues, 1);
return createAnimation(view, startAlpha, 0);
}
private static float getStartAlpha(TransitionValues startValues, float fallbackValue) {
float startAlpha = fallbackValue;
if (startValues != null) {
Float startAlphaFloat = (Float) startValues.values.get(PROPNAME_TRANSITION_ALPHA);
if (startAlphaFloat != null) {
startAlpha = startAlphaFloat;
}
}
return startAlpha;
}
private static class FadeAnimatorListener extends AnimatorListenerAdapter {
private final View mView;
private boolean mLayerTypeChanged = false;