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

Commit 79e6e3d4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Notify Home visibility even when DragToDesktop START aborted" into main

parents 063631c6 76a3a402

libs/WindowManager/Shell/src/com/android/wm/shell/transition/HomeTransitionObserver.java

+0 −1
Original line number Diff line number Diff line
@@ -153,7 +153,6 @@ public class HomeTransitionObserver implements TransitionObserver, 
            return;

        }

        mPendingStartDragTransition = null;

        if (aborted) return;



        if (mPendingHomeVisibilityUpdate != null) {

            notifyHomeVisibilityChanged(mPendingHomeVisibilityUpdate);

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/transition/HomeTransitionObserverTest.java

+2 −2
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ public class HomeTransitionObserverTest extends ShellTestCase { 


    @Test

    @EnableFlags({FLAG_ENABLE_DRAG_TO_DESKTOP_INCOMING_TRANSITIONS_BUGFIX})

    public void startDragToDesktopAborted_doesNotTriggerCallback() throws RemoteException {

    public void startDragToDesktopAborted_triggersCallback() throws RemoteException {

        TransitionInfo info = mock(TransitionInfo.class);

        TransitionInfo.Change change = mock(TransitionInfo.Change.class);

        ActivityManager.RunningTaskInfo taskInfo = mock(ActivityManager.RunningTaskInfo.class);
@@ -239,7 +239,7 @@ public class HomeTransitionObserverTest extends ShellTestCase { 


        mHomeTransitionObserver.onTransitionFinished(transition, /* aborted= */ true);



        verify(mListener, never()).onHomeVisibilityChanged(/* isVisible= */ anyBoolean());

        verify(mListener).onHomeVisibilityChanged(/* isVisible= */ true);

    }



    @Test