diff options
author | Xin Li <delphij@google.com> | 2023-12-07 15:48:03 -0800 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2023-12-07 15:48:03 -0800 |
commit | 861ce33a5962f1313c523a8e74f0305b705e4dc9 (patch) | |
tree | 894539c4682d3107ea9b0486862f31e7869bcae6 | |
parent | f3eb5388d1e28c8a66ae4ce6529d453e6528ee68 (diff) | |
parent | 307d65beee1d75fd30c66a1a6a840a524bdd7f49 (diff) | |
download | Launcher3-861ce33a5962f1313c523a8e74f0305b705e4dc9.tar.gz |
Merge UQ1A.231205.015tmp_amf_315507370
Bug: 308969284
Merged-In: I91dd8b4088f02af9dc5e603853d8e26606acc38f
Change-Id: I7f5bca7edd18631b36f2b9213e17554cf769cbc6
-rw-r--r-- | quickstep/src/com/android/quickstep/views/TaskView.java | 11 | ||||
-rw-r--r-- | tests/src/com/android/launcher3/icons/FastBitmapDrawableTest.java | 16 |
2 files changed, 27 insertions, 0 deletions
diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java index 2a40ccfd4c..39b6c62949 100644 --- a/quickstep/src/com/android/quickstep/views/TaskView.java +++ b/quickstep/src/com/android/quickstep/views/TaskView.java @@ -1010,6 +1010,17 @@ public class TaskView extends FrameLayout implements Reusable { mActivity.getStateManager(), recentsView, recentsView.getDepthController()); anim.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationStart(Animator animation) { + if (!recentsView.showAsGrid()) { + return; + } + recentsView.runActionOnRemoteHandles( + (Consumer<RemoteTargetHandle>) remoteTargetHandle -> + remoteTargetHandle + .getTaskViewSimulator() + .setDrawsBelowRecents(false)); + } @Override public void onAnimationEnd(Animator animator) { diff --git a/tests/src/com/android/launcher3/icons/FastBitmapDrawableTest.java b/tests/src/com/android/launcher3/icons/FastBitmapDrawableTest.java index 038c98b271..fbbfb2af48 100644 --- a/tests/src/com/android/launcher3/icons/FastBitmapDrawableTest.java +++ b/tests/src/com/android/launcher3/icons/FastBitmapDrawableTest.java @@ -31,6 +31,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.graphics.Bitmap; +import android.graphics.drawable.Drawable; import android.view.animation.AccelerateInterpolator; import android.view.animation.DecelerateInterpolator; import android.view.animation.PathInterpolator; @@ -42,6 +43,8 @@ import androidx.test.runner.AndroidJUnit4; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; import org.mockito.Spy; /** @@ -56,9 +59,11 @@ public class FastBitmapDrawableTest { @Spy FastBitmapDrawable mFastBitmapDrawable = spy(new FastBitmapDrawable(Bitmap.createBitmap(100, 100, Bitmap.Config.ARGB_8888))); + @Mock Drawable mBadge; @Before public void setUp() { + MockitoAnnotations.initMocks(this); FastBitmapDrawable.setFlagHoverEnabled(true); when(mFastBitmapDrawable.isVisible()).thenReturn(true); mFastBitmapDrawable.mIsPressed = false; @@ -326,4 +331,15 @@ public class FastBitmapDrawableTest { assertEquals("End value not correct.", (float) SCALE.get(mFastBitmapDrawable), 1f, EPSILON); verify(mFastBitmapDrawable).invalidateSelf(); } + + @Test + public void testUpdateBadgeAlpha() { + mFastBitmapDrawable.setBadge(mBadge); + + mFastBitmapDrawable.setAlpha(1); + mFastBitmapDrawable.setAlpha(0); + + verify(mBadge).setAlpha(1); + verify(mBadge).setAlpha(0); + } } |