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

Commit 90b006db authored by Vinit Nayak's avatar Vinit Nayak
Browse files

Reset Overview layout after swiping to home 

Reset overview when user does a swipe to home
gesture. Preivously we only rest when user
first when to over, and then swiped to home.

Fixes: 156053957
Change-Id: I5a157f9e2229aba4b36851bd46d704a39d647110
parent dbb212e9

quickstep/recents_ui_overrides/src/com/android/quickstep/BaseSwipeUpHandlerV2.java

+1 −1
Original line number Diff line number Diff line
@@ -1035,7 +1035,7 @@ public abstract class BaseSwipeUpHandlerV2<T extends StatefulActivity<?>, Q exte 
                }

                // Make sure recents is in its final state

                maybeUpdateRecentsAttachedState(false);

                mActivityInterface.onSwipeUpToHomeComplete();

                mActivityInterface.onSwipeUpToHomeComplete(mDeviceState);

            }

        });

        return anim;

quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackActivityInterface.java

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ public final class FallbackActivityInterface extends 


    /** 4 */

    @Override

    public void onSwipeUpToHomeComplete() {

    public void onSwipeUpToHomeComplete(RecentsAnimationDeviceState deviceState) {

        onSwipeUpToRecentsComplete();

    }

quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityInterface.java

+10 −6
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ public final class LauncherActivityInterface extends 
    }



    @Override

    public void onSwipeUpToHomeComplete() {

    public void onSwipeUpToHomeComplete(RecentsAnimationDeviceState deviceState) {

        Launcher launcher = getCreatedActivity();

        if (launcher == null) {

            return;
@@ -105,6 +105,7 @@ public final class LauncherActivityInterface extends 
        // recents, we assume the first task is invisible, making translation off by one task.

        launcher.getStateManager().reapplyState();

        launcher.getRootView().setForceHideBackArrow(false);

        notifyRecentsOfOrientation(deviceState);

    }



    @Override
@@ -235,15 +236,18 @@ public final class LauncherActivityInterface extends 
                        // Are we going from Recents to Workspace?

                        if (toState == LauncherState.NORMAL) {

                            exitRunnable.run();

                            notifyRecentsOfOrientation(deviceState);

                            stateManager.removeStateListener(this);

                        }

                    }

                });

    }



    private void notifyRecentsOfOrientation(RecentsAnimationDeviceState deviceState) {

        // reset layout on swipe to home

        RecentsView recentsView = getCreatedActivity().getOverviewPanel();

        recentsView.setLayoutRotation(deviceState.getCurrentActiveRotation(),

                deviceState.getDisplayRotation());

                            stateManager.removeStateListener(this);

                        }

                    }

                });

    }



    @Override

quickstep/src/com/android/quickstep/BaseActivityInterface.java

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ public abstract class BaseActivityInterface<STATE_TYPE extends BaseState<STATE_T 
        activity.getStateManager().reapplyState();

    }



    public abstract void onSwipeUpToHomeComplete();

    public abstract void onSwipeUpToHomeComplete(RecentsAnimationDeviceState deviceState);



    public abstract void onAssistantVisibilityChanged(float visibility);