Merge "Merge "Show mobile signal strength in QS edit panel" into oc-mr1-dev... (97fb5d7c) · Commits · e / os / android_frameworks_base

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -48,6 +48,7 @@ public class SlashImageView extends ImageView {
		mSlash = null;
		super.setImageDrawable(null);
		} else if (mSlash == null) {
		setImageLevel(drawable.getLevel());
		super.setImageDrawable(drawable);
		} else {
		mSlash.setAnimationEnabled(mAnimationEnabled);

+13 −0

Original line number	Diff line number	Diff line
		@@ -76,6 +76,19 @@ public class SlashImageViewTest extends SysuiTestCase {
		assertTrue(mSlashView.getSlashDrawable() == null);
		}

		@Test
		public void testSetImageDrawableUsesDrawableLevel() {
		SlashImageView iv = new SlashImageView(mContext);
		Drawable mockDrawable = mock(Drawable.class);
		mockDrawable.setLevel(2);
		assertTrue(mockDrawable.getLevel() == 2);

		iv.setImageDrawable(mockDrawable);

		// Make sure setting the drawable didn't reset its level to 0
		assertTrue(mockDrawable.getLevel() == 2);
		}

		// Expose getSlashDrawable
		private static class TestableSlashImageView extends SlashImageView {
		TestableSlashImageView(Context c) {