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

Commit 0e068b12 authored by Ats Jenk's avatar Ats Jenk
Browse files

Pass in display when using DesktopMode APIs 

Pass in the display id when asking wmshell to show desktop apps or when
querying the number of visible desktop tasks.

Bug: 278084491
Test: open some apps on the desktop, swipe up to recents, tap the
  desktop tile to open desktop again
Change-Id: Ia7328613244a1aa401e0e4792bc747a4b99b412d
parent 8c1bffb2

quickstep/src/com/android/quickstep/RemoteTargetGluer.java

+4 −3
Original line number Diff line number Diff line
@@ -52,9 +52,10 @@ public class RemoteTargetGluer { 
     */

    public RemoteTargetGluer(Context context, BaseActivityInterface sizingStrategy) {

        if (DesktopTaskView.DESKTOP_MODE_SUPPORTED) {

            // TODO: binder call, only for prototyping. Creating the gluer should be postponed so

            //  we can create it when we have the remote animation targets ready.

            int desktopTasks = SystemUiProxy.INSTANCE.get(context).getVisibleDesktopTaskCount();

            // TODO(279931899): binder call, only for prototyping. Creating the gluer should be

            //  postponed so we can create it when we have the remote animation targets ready.

            int desktopTasks = SystemUiProxy.INSTANCE.get(context).getVisibleDesktopTaskCount(

                    context.getDisplayId());

            if (desktopTasks > 0) {

                init(context, sizingStrategy, desktopTasks, true /* forDesktop */);

                return;

quickstep/src/com/android/quickstep/SystemUiProxy.java

+4 −4
Original line number Diff line number Diff line
@@ -1060,10 +1060,10 @@ public class SystemUiProxy implements ISystemUiProxy { 
    //



    /** Call shell to show all apps active on the desktop */

    public void showDesktopApps() {

    public void showDesktopApps(int displayId) {

        if (mDesktopMode != null) {

            try {

                mDesktopMode.showDesktopApps();

                mDesktopMode.showDesktopApps(displayId);

            } catch (RemoteException e) {

                Log.w(TAG, "Failed call showDesktopApps", e);

            }
@@ -1071,10 +1071,10 @@ public class SystemUiProxy implements ISystemUiProxy { 
    }



    /** Call shell to get number of visible freeform tasks */

    public int getVisibleDesktopTaskCount() {

    public int getVisibleDesktopTaskCount(int displayId) {

        if (mDesktopMode != null) {

            try {

                return mDesktopMode.getVisibleTaskCount();

                return mDesktopMode.getVisibleTaskCount(displayId);

            } catch (RemoteException e) {

                Log.w(TAG, "Failed call getVisibleDesktopTaskCount", e);

            }

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

+1 −1
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ public class DesktopTaskView extends TaskView { 


    @Override

    public RunnableList launchTasks() {

        SystemUiProxy.INSTANCE.get(getContext()).showDesktopApps();

        SystemUiProxy.INSTANCE.get(getContext()).showDesktopApps(mActivity.getDisplayId());

        Launcher.getLauncher(mActivity).getStateManager().goToState(NORMAL, false /* animated */);

        return null;

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ public class LauncherRecentsView extends RecentsView<QuickstepLauncher, Launcher 
            desktopVisibilityController.setGestureInProgress(false);

        }

        if (showDesktopApps) {

            SystemUiProxy.INSTANCE.get(mActivity).showDesktopApps();

            SystemUiProxy.INSTANCE.get(mActivity).showDesktopApps(mActivity.getDisplayId());

        }

    }

}