Merge "Only call setHasTransientState in captureHierarchy." into lmp-dev (a740b2bf) · Commits · e / os / android_frameworks_base

core/java/android/transition/Transition.java

+11 −7

Original line number	Diff line number	Diff line
		@@ -1417,9 +1417,9 @@ public abstract class Transition implements Cloneable {
		}
		capturePropagationValues(values);
		if (start) {
		addViewValues(mStartValues, view, values);
		addViewValues(mStartValues, view, values, true);
		} else {
		addViewValues(mEndValues, view, values);
		addViewValues(mEndValues, view, values, true);
		}
		}
		}
		@@ -1460,7 +1460,7 @@ public abstract class Transition implements Cloneable {
		}

		static void addViewValues(TransitionValuesMaps transitionValuesMaps,
		View view, TransitionValues transitionValues) {
		View view, TransitionValues transitionValues, boolean setTransientState) {
		transitionValuesMaps.viewValues.put(view, transitionValues);
		int id = view.getId();
		if (id >= 0) {
		@@ -1489,11 +1489,15 @@ public abstract class Transition implements Cloneable {
		// Duplicate item IDs: cannot match by item ID.
		View alreadyMatched = transitionValuesMaps.itemIdValues.get(itemId);
		if (alreadyMatched != null) {
		if (setTransientState) {
		alreadyMatched.setHasTransientState(false);
		}
		transitionValuesMaps.itemIdValues.put(itemId, null);
		}
		} else {
		if (setTransientState) {
		view.setHasTransientState(true);
		}
		transitionValuesMaps.itemIdValues.put(itemId, view);
		}
		}
		@@ -1560,9 +1564,9 @@ public abstract class Transition implements Cloneable {
		}
		capturePropagationValues(values);
		if (start) {
		addViewValues(mStartValues, view, values);
		addViewValues(mStartValues, view, values, true);
		} else {
		addViewValues(mEndValues, view, values);
		addViewValues(mEndValues, view, values, true);
		}
		}
		if (view instanceof ViewGroup) {

core/java/android/transition/TransitionSet.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -408,7 +408,7 @@ public class TransitionSet extends Transition {
		for (int i = 0; i < numValues; i++) {
		View view = values.viewValues.keyAt(i);
		if (isValidTarget(view)) {
		addViewValues(included, view, values.viewValues.valueAt(i));
		addViewValues(included, view, values.viewValues.valueAt(i), false);
		}
		}
		return included;