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

Commit ba3ca2f5 authored by Jon Miranda's avatar Jon Miranda Committed by Android (Google) Code Review
Browse files

Merge changes from topic... 

Merge changes from topic "presubmit-am-a0fe463985e8453c9c1e5b6ccc543c8b-sc-v2-dev" into sc-v2-dev-plus-aosp

* changes:
  [automerge] Never look for matching view in All Apps when swiping up to go home. 2p: b2068f2e
  Never look for matching view in All Apps when swiping up to go home.
parents 8e8638d8 b35524b4

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

+2 −2
Original line number Diff line number Diff line
@@ -1298,8 +1298,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
@@ -2713,8 +2713,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) ->
@@ -2725,7 +2728,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) {