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

Commit b2068f2e authored by Jon Miranda's avatar Jon Miranda
Browse files

Never look for matching view in All Apps when swiping up to go home. 

The swiping up gesture will never return an app in All Apps,
so we can ignore All Apps state in those cases.

This fixes an edge case where user swipes up and launcher state
is still in All Apps. This causes us to animate the icon to
where it would be in All Apps, even though by the time the
animation starts we are actually in Normal state.

Bug: 222124240
Test: open app from  all apps then quickly swipe up to go home
Change-Id: I756a870660a397d6629aec82e4f5ec4914ed0669
(cherry picked from commit b42e124f)
parent 1d4dc1ba

quickstep/src/com/android/launcher3/QuickstepTransitionManager.java

+2 −2
Original line number Diff line number Diff line
@@ -1274,8 +1274,8 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener 
            }

        }



        return mLauncher.getFirstMatchForAppClose(launchCookieItemId,

                packageName, UserHandle.of(runningTaskTarget.taskInfo.userId));

        return mLauncher.getFirstMatchForAppClose(launchCookieItemId, packageName,

                UserHandle.of(runningTaskTarget.taskInfo.userId), true /* supportsAllAppsState */);

    }



    private @NonNull RectF getDefaultWindowTargetRect() {

quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java

+2 −1
Original line number Diff line number Diff line
@@ -246,7 +246,8 @@ public class LauncherSwipeHandlerV2 extends 


        return mActivity.getFirstMatchForAppClose(launchCookieItemId,

                runningTaskView.getTask().key.getComponent().getPackageName(),

                UserHandle.of(runningTaskView.getTask().key.userId));

                UserHandle.of(runningTaskView.getTask().key.userId),

                false /* supportsAllAppsState */);

    }



    @Override

src/com/android/launcher3/Launcher.java

+5 −2
Original line number Diff line number Diff line
@@ -2688,8 +2688,11 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche 
     * @param preferredItemId The id of the preferred item to match to if it exists.

     * @param packageName The package name of the app to match.

     * @param user The user of the app to match.

     * @param supportsAllAppsState If true and we are in All Apps state, looks for view in All Apps.

     *                             Else we only looks on the workspace.

     */

    public View getFirstMatchForAppClose(int preferredItemId, String packageName, UserHandle user) {

    public View getFirstMatchForAppClose(int preferredItemId, String packageName, UserHandle user,

            boolean supportsAllAppsState) {

        final ItemInfoMatcher preferredItem = (info, cn) ->

                info != null && info.id == preferredItemId;

        final ItemInfoMatcher packageAndUserAndApp = (info, cn) ->
@@ -2700,7 +2703,7 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche 
                        && TextUtils.equals(info.getTargetComponent().getPackageName(),

                        packageName);



        if (isInState(LauncherState.ALL_APPS)) {

        if (supportsAllAppsState && isInState(LauncherState.ALL_APPS)) {

            return getFirstMatch(Collections.singletonList(mAppsView.getActiveRecyclerView()),

                    preferredItem, packageAndUserAndApp);

        } else {

src/com/android/launcher3/views/FloatingSurfaceView.java

+2 −1
Original line number Diff line number Diff line
@@ -159,7 +159,8 @@ public class FloatingSurfaceView extends AbstractFloatingView implements 
            return;

        }

        View icon = mLauncher.getFirstMatchForAppClose(-1,

                mContract.componentName.getPackageName(), mContract.user);

                mContract.componentName.getPackageName(), mContract.user,

                false /* supportsAllAppsState */);



        boolean iconChanged = mIcon != icon;

        if (iconChanged) {