Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 861ce33a authored by Xin Li's avatar Xin Li
Browse files

Merge UQ1A.231205.015 

Bug: 308969284
Merged-In: I91dd8b4088f02af9dc5e603853d8e26606acc38f
Change-Id: I7f5bca7edd18631b36f2b9213e17554cf769cbc6
parents f3eb5388 307d65be

quickstep/src/com/android/quickstep/views/TaskView.java

+11 −0
Original line number Diff line number Diff line
@@ -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) {

tests/src/com/android/launcher3/icons/FastBitmapDrawableTest.java

+16 −0
Original line number Diff line number Diff line
@@ -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);

    }

}