Merge "Fix state list drawable transitions" into lmp-dev (e4272bb3) · Commits · e / os / android_frameworks_base

core/res/res/drawable/btn_check_material_anim.xml

+16 −16

Original line number	Diff line number	Diff line
		@@ -30,28 +30,28 @@
		<transition android:fromId="@+id/off" android:toId="@+id/on">
		<animation-list>
		<item android:duration="15">
		<bitmap android:src="@drawable/btn_check_to_on_mtrl_000" android:tint="?attr/colorControlActivated" />
		<bitmap android:src="@drawable/btn_check_to_on_mtrl_000" android:tint="?attr/colorControlNormal" />
		</item>
		<item android:duration="15">
		<bitmap android:src="@drawable/btn_check_to_on_mtrl_001" android:tint="?attr/colorControlActivated" />
		<bitmap android:src="@drawable/btn_check_to_on_mtrl_001" android:tint="?attr/colorControlNormal" />
		</item>
		<item android:duration="15">
		<bitmap android:src="@drawable/btn_check_to_on_mtrl_002" android:tint="?attr/colorControlActivated" />
		<bitmap android:src="@drawable/btn_check_to_on_mtrl_002" android:tint="?attr/colorControlNormal" />
		</item>
		<item android:duration="15">
		<bitmap android:src="@drawable/btn_check_to_on_mtrl_003" android:tint="?attr/colorControlActivated" />
		<bitmap android:src="@drawable/btn_check_to_on_mtrl_003" android:tint="?attr/colorControlNormal" />
		</item>
		<item android:duration="15">
		<bitmap android:src="@drawable/btn_check_to_on_mtrl_004" android:tint="?attr/colorControlActivated" />
		<bitmap android:src="@drawable/btn_check_to_on_mtrl_004" android:tint="?attr/colorControlNormal" />
		</item>
		<item android:duration="15">
		<bitmap android:src="@drawable/btn_check_to_on_mtrl_005" android:tint="?attr/colorControlActivated" />
		<bitmap android:src="@drawable/btn_check_to_on_mtrl_005" android:tint="?attr/colorControlNormal" />
		</item>
		<item android:duration="15">
		<bitmap android:src="@drawable/btn_check_to_on_mtrl_006" android:tint="?attr/colorControlActivated" />
		<bitmap android:src="@drawable/btn_check_to_on_mtrl_006" android:tint="?attr/colorControlNormal" />
		</item>
		<item android:duration="15">
		<bitmap android:src="@drawable/btn_check_to_on_mtrl_007" android:tint="?attr/colorControlActivated" />
		<bitmap android:src="@drawable/btn_check_to_on_mtrl_007" android:tint="?attr/colorControlNormal" />
		</item>
		<item android:duration="15">
		<bitmap android:src="@drawable/btn_check_to_on_mtrl_008" android:tint="?attr/colorControlActivated" />
		@@ -106,28 +106,28 @@
		<bitmap android:src="@drawable/btn_check_to_off_mtrl_007" android:tint="?attr/colorControlActivated" />
		</item>
		<item android:duration="15">
		<bitmap android:src="@drawable/btn_check_to_off_mtrl_008" android:tint="?attr/colorControlActivated" />
		<bitmap android:src="@drawable/btn_check_to_off_mtrl_008" android:tint="?attr/colorControlNormal" />
		</item>
		<item android:duration="15">
		<bitmap android:src="@drawable/btn_check_to_off_mtrl_009" android:tint="?attr/colorControlActivated" />
		<bitmap android:src="@drawable/btn_check_to_off_mtrl_009" android:tint="?attr/colorControlNormal" />
		</item>
		<item android:duration="15">
		<bitmap android:src="@drawable/btn_check_to_off_mtrl_010" android:tint="?attr/colorControlActivated" />
		<bitmap android:src="@drawable/btn_check_to_off_mtrl_010" android:tint="?attr/colorControlNormal" />
		</item>
		<item android:duration="15">
		<bitmap android:src="@drawable/btn_check_to_off_mtrl_011" android:tint="?attr/colorControlActivated" />
		<bitmap android:src="@drawable/btn_check_to_off_mtrl_011" android:tint="?attr/colorControlNormal" />
		</item>
		<item android:duration="15">
		<bitmap android:src="@drawable/btn_check_to_off_mtrl_012" android:tint="?attr/colorControlActivated" />
		<bitmap android:src="@drawable/btn_check_to_off_mtrl_012" android:tint="?attr/colorControlNormal" />
		</item>
		<item android:duration="15">
		<bitmap android:src="@drawable/btn_check_to_off_mtrl_013" android:tint="?attr/colorControlActivated" />
		<bitmap android:src="@drawable/btn_check_to_off_mtrl_013" android:tint="?attr/colorControlNormal" />
		</item>
		<item android:duration="15">
		<bitmap android:src="@drawable/btn_check_to_off_mtrl_014" android:tint="?attr/colorControlActivated" />
		<bitmap android:src="@drawable/btn_check_to_off_mtrl_014" android:tint="?attr/colorControlNormal" />
		</item>
		<item android:duration="15">
		<bitmap android:src="@drawable/btn_check_to_off_mtrl_015" android:tint="?attr/colorControlActivated" />
		<bitmap android:src="@drawable/btn_check_to_off_mtrl_015" android:tint="?attr/colorControlNormal" />
		</item>
		</animation-list>
		</transition>

graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java

+15 −25

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

		package android.graphics.drawable;

		import android.animation.Animator;
		import android.animation.AnimatorListenerAdapter;
		import android.animation.ObjectAnimator;
		import android.animation.TimeInterpolator;
		import android.annotation.NonNull;
		@@ -160,48 +158,51 @@ public class AnimatedStateListDrawable extends StateListDrawable {
		}

		private boolean selectTransition(int toIndex) {
		if (toIndex == mTransitionToIndex) {
		// Already animating to that keyframe.
		return true;
		}

		final int fromIndex;
		final Transition currentTransition = mTransition;
		if (currentTransition != null) {
		if (toIndex == mTransitionToIndex) {
		// Already animating to that keyframe.
		return true;
		} else if (toIndex == mTransitionFromIndex) {
		} else if (toIndex == mTransitionFromIndex && currentTransition.canReverse()) {
		// Reverse the current animation.
		currentTransition.reverse();
		mTransitionFromIndex = mTransitionToIndex;
		mTransitionToIndex = toIndex;
		mTransitionToIndex = mTransitionFromIndex;
		mTransitionFromIndex = toIndex;
		return true;
		}

		// Start the next transition from the end of the current one.
		fromIndex = mTransitionToIndex;

		// Changing animation, end the current animation.
		currentTransition.stop();
		mTransition = null;
		} else {
		fromIndex = getCurrentIndex();
		}

		// Reset state.
		mTransition = null;
		mTransitionFromIndex = -1;
		mTransitionToIndex = -1;

		final AnimatedStateListState state = mState;
		final int fromIndex = getCurrentIndex();
		final int fromId = state.getKeyframeIdAt(fromIndex);
		final int toId = state.getKeyframeIdAt(toIndex);

		if (toId == 0 \|\| fromId == 0) {
		// Missing a keyframe ID.
		return false;
		}

		final int transitionIndex = state.indexOfTransition(fromId, toId);
		if (transitionIndex < 0 \|\| !selectDrawable(transitionIndex)) {
		if (transitionIndex < 0) {
		// Couldn't select a transition.
		return false;
		}

		// This may fail if we're already on the transition, but that's okay!
		selectDrawable(transitionIndex);

		final Transition transition;
		final Drawable d = getCurrent();
		if (d instanceof AnimationDrawable) {
		@@ -500,17 +501,6 @@ public class AnimatedStateListDrawable extends StateListDrawable {
		return this;
		}

		private final AnimatorListenerAdapter mAnimListener = new AnimatorListenerAdapter() {
		@Override
		public void onAnimationEnd(Animator anim) {
		selectDrawable(mTransitionToIndex);

		mTransitionToIndex = -1;
		mTransitionFromIndex = -1;
		mTransition = null;
		}
		};

		static class AnimatedStateListState extends StateListState {
		private static final int REVERSE_SHIFT = 32;
		private static final int REVERSE_MASK = 0x1;