Set FastBitmapDrawable's badge alpha when updating drawable alpha.

Test: FastBitmapDrawableTest
Fix: 304559962
Change-Id: Ie545cc5da506c77af18f99b5d045cafc37110a5a
This commit is contained in:
Pat Manning
2023-10-16 09:52:06 +00:00
parent 5838767cc2
commit 08f89425bb
@@ -31,6 +31,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.drawable.Drawable;
import android.view.animation.AccelerateInterpolator; import android.view.animation.AccelerateInterpolator;
import android.view.animation.DecelerateInterpolator; import android.view.animation.DecelerateInterpolator;
import android.view.animation.PathInterpolator; import android.view.animation.PathInterpolator;
@@ -42,6 +43,8 @@ import androidx.test.runner.AndroidJUnit4;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.mockito.Spy; import org.mockito.Spy;
/** /**
@@ -56,9 +59,11 @@ public class FastBitmapDrawableTest {
@Spy @Spy
FastBitmapDrawable mFastBitmapDrawable = FastBitmapDrawable mFastBitmapDrawable =
spy(new FastBitmapDrawable(Bitmap.createBitmap(100, 100, Bitmap.Config.ARGB_8888))); spy(new FastBitmapDrawable(Bitmap.createBitmap(100, 100, Bitmap.Config.ARGB_8888)));
@Mock Drawable mBadge;
@Before @Before
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this);
FastBitmapDrawable.setFlagHoverEnabled(true); FastBitmapDrawable.setFlagHoverEnabled(true);
when(mFastBitmapDrawable.isVisible()).thenReturn(true); when(mFastBitmapDrawable.isVisible()).thenReturn(true);
mFastBitmapDrawable.mIsPressed = false; mFastBitmapDrawable.mIsPressed = false;
@@ -326,4 +331,15 @@ public class FastBitmapDrawableTest {
assertEquals("End value not correct.", (float) SCALE.get(mFastBitmapDrawable), 1f, EPSILON); assertEquals("End value not correct.", (float) SCALE.get(mFastBitmapDrawable), 1f, EPSILON);
verify(mFastBitmapDrawable).invalidateSelf(); verify(mFastBitmapDrawable).invalidateSelf();
} }
@Test
public void testUpdateBadgeAlpha() {
mFastBitmapDrawable.setBadge(mBadge);
mFastBitmapDrawable.setAlpha(1);
mFastBitmapDrawable.setAlpha(0);
verify(mBadge).setAlpha(1);
verify(mBadge).setAlpha(0);
}
} }