Merge "Fix not animating icons" into tm-qpr-dev (887d4bb6) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSIconViewImpl.java

+13 −8

Original line number	Diff line number	Diff line
		@@ -140,9 +140,10 @@ public class QSIconViewImpl extends QSIconView {
		iv.setTag(R.id.qs_icon_tag, icon);
		iv.setTag(R.id.qs_slash_tag, state.slash);
		iv.setPadding(0, padding, 0, padding);
		if (shouldAnimate && d instanceof Animatable2) {
		if (d instanceof Animatable2) {
		Animatable2 a = (Animatable2) d;
		a.start();
		if (shouldAnimate) {
		if (state.isTransient) {
		a.registerAnimationCallback(new AnimationCallback() {
		@Override
		@@ -151,6 +152,10 @@ public class QSIconViewImpl extends QSIconView {
		}
		});
		}
		} else {
		// Sends animator to end of animation. Needs to be called after calling start.
		a.stop();
		}
		}
		}
		}

+6 −2

Original line number	Diff line number	Diff line
		@@ -40,6 +40,8 @@ import com.android.systemui.plugins.qs.QSTile.State;
		import org.junit.Before;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.InOrder;
		import org.mockito.Mockito;

		@RunWith(AndroidTestingRunner.class)
		@UiThreadTest
		@@ -138,7 +140,7 @@ public class QSIconViewImplTest extends SysuiTestCase {
		}

		@Test
		public void testIconNotAnimatedWhenAllowAnimationsFalse() {
		public void testIconStartedAndStoppedWhenAllowAnimationsFalse() {
		ImageView iv = new ImageView(mContext);
		AnimatedVectorDrawable d = mock(AnimatedVectorDrawable.class);
		State s = new State();
		@@ -148,7 +150,9 @@ public class QSIconViewImplTest extends SysuiTestCase {

		mIconView.updateIcon(iv, s, false);

		verify(d, never()).start();
		InOrder inOrder = Mockito.inOrder(d);
		inOrder.verify(d).start();
		inOrder.verify(d).stop();
		}

		private static Drawable.ConstantState fakeConstantState(Drawable otherDrawable) {