Adds ScrollBounds to the Transition framework (2dcab18c) · Commits · e / os / android_frameworks_base

core/java/android/transition/ChangeBounds.java

+4 −14

Original line number	Diff line number	Diff line
		@@ -193,7 +193,8 @@ public class ChangeBounds extends Transition {
		bottomRightAnimator = ObjectAnimator.ofInt(view, "right", "bottom",
		bottomRightPath);
		}
		Animator anim = mergeAnimators(topLeftAnimator, bottomRightAnimator);
		Animator anim = TransitionUtils.mergeAnimators(topLeftAnimator,
		bottomRightAnimator);
		if (view.getParent() instanceof ViewGroup) {
		final ViewGroup parent = (ViewGroup) view.getParent();
		parent.suppressLayout(true);
		@@ -256,7 +257,8 @@ public class ChangeBounds extends Transition {
		clipAnimator = ObjectAnimator.ofObject(view, "clipBounds", sRectEvaluator,
		tempStartBounds, tempEndBounds);
		}
		Animator anim = mergeAnimators(translationAnimator, clipAnimator);
		Animator anim = TransitionUtils.mergeAnimators(translationAnimator,
		clipAnimator);
		if (view.getParent() instanceof ViewGroup) {
		final ViewGroup parent = (ViewGroup) view.getParent();
		parent.suppressLayout(true);
		@@ -330,16 +332,4 @@ public class ChangeBounds extends Transition {
		}
		return null;
		}

		private static Animator mergeAnimators(Animator animator1, Animator animator2) {
		if (animator1 == null) {
		return animator2;
		} else if (animator2 == null) {
		return animator1;
		} else {
		AnimatorSet animatorSet = new AnimatorSet();
		animatorSet.playTogether(animator1, animator2);
		return animatorSet;
		}
		}
		}

core/java/android/transition/ChangeScroll.java

0 → 100644

+83 −0

Original line number	Diff line number	Diff line
		/*
		* 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 android.transition;

		import android.animation.Animator;
		import android.animation.ObjectAnimator;
		import android.content.Context;
		import android.transition.Transition;
		import android.transition.TransitionValues;
		import android.util.AttributeSet;
		import android.view.View;
		import android.view.ViewGroup;

		/**
		* This transition captures the scroll properties of targets before and after
		* the scene change and animates any changes.
		*
		* @hide
		*/
		public class ChangeScroll extends Transition {

		private static final String PROPNAME_SCROLL_X = "android:changeScroll:x";
		private static final String PROPNAME_SCROLL_Y = "android:changeScroll:y";

		public ChangeScroll() {}

		public ChangeScroll(Context context, AttributeSet attrs) {
		super(context, attrs);
		}

		@Override
		public void captureStartValues(TransitionValues transitionValues) {
		captureValues(transitionValues);
		}

		@Override
		public void captureEndValues(TransitionValues transitionValues) {
		captureValues(transitionValues);
		}

		private void captureValues(TransitionValues transitionValues) {
		transitionValues.values.put(PROPNAME_SCROLL_X, transitionValues.view.getScrollX());
		transitionValues.values.put(PROPNAME_SCROLL_Y, transitionValues.view.getScrollY());
		}

		@Override
		public Animator createAnimator(ViewGroup sceneRoot, TransitionValues startValues,
		TransitionValues endValues) {
		if (startValues == null \|\| endValues == null) {
		return null;
		}
		final View view = endValues.view;
		int startX = (Integer) startValues.values.get(PROPNAME_SCROLL_X);
		int endX = (Integer) endValues.values.get(PROPNAME_SCROLL_X);
		int startY = (Integer) startValues.values.get(PROPNAME_SCROLL_Y);
		int endY = (Integer) endValues.values.get(PROPNAME_SCROLL_Y);
		Animator scrollXAnimator = null;
		Animator scrollYAnimator = null;
		if (startX != endX) {
		view.setScrollX(startX);
		scrollXAnimator = ObjectAnimator.ofInt(view, "scrollX", startX, endX);
		}
		if (startY != endY) {
		view.setScrollY(startY);
		scrollYAnimator = ObjectAnimator.ofInt(view, "scrollY", startY, endY);
		}
		return TransitionUtils.mergeAnimators(scrollXAnimator, scrollYAnimator);
		}
		}

core/java/android/transition/TransitionInflater.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -159,6 +159,8 @@ public class TransitionInflater {
		transition = new AutoTransition(mContext, attrs);
		} else if ("recolor".equals(name)) {
		transition = new Recolor(mContext, attrs);
		} else if ("changeScroll".equals(name)) {
		transition = new ChangeScroll(mContext, attrs);
		} else if ("transitionSet".equals(name)) {
		transition = new TransitionSet(mContext, attrs);
		} else if ("transition".equals(name)) {

core/java/android/transition/TransitionUtils.java

0 → 100644

+40 −0

Original line number	Diff line number	Diff line
		/*
		* 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 android.transition;

		import android.animation.Animator;
		import android.animation.AnimatorSet;

		/**
		* Static utility methods for Transitions.
		*
		* @hide
		*/
		public class TransitionUtils {

		static Animator mergeAnimators(Animator animator1, Animator animator2) {
		if (animator1 == null) {
		return animator2;
		} else if (animator2 == null) {
		return animator1;
		} else {
		AnimatorSet animatorSet = new AnimatorSet();
		animatorSet.playTogether(animator1, animator2);
		return animatorSet;
		}
		}
		}