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

Commit ff3baac2 authored by Will Osborn's avatar Will Osborn Committed by Android (Google) Code Review
Browse files

Merge "Add displayId to ILauncherProxy.enterStateSplitFromRunningApp" into main

parents e7a0aef5 c47a7adf

packages/SystemUI/shared/src/com/android/systemui/shared/recents/ILauncherProxy.aidl

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ oneway interface ILauncherProxy { 
    /**

     * Sent when split keyboard shortcut is triggered to enter stage split.

     */

    void enterStageSplitFromRunningApp(boolean leftOrTop) = 25;

    void enterStageSplitFromRunningApp(int displayId, boolean leftOrTop) = 25;



    /**

     * Sent when the task bar stash state is toggled.

packages/SystemUI/src/com/android/systemui/LauncherProxyService.java

+1 −1
Original line number Diff line number Diff line
@@ -833,7 +833,7 @@ public class LauncherProxyService implements CallbackController<LauncherProxyLis 
                                & SYSUI_STATE_FREEFORM_ACTIVE_IN_DESKTOP_MODE) != 0) {

                            return;

                        }

                        mLauncherProxy.enterStageSplitFromRunningApp(leftOrTop);

                        mLauncherProxy.enterStageSplitFromRunningApp(displayId, leftOrTop);

                    } catch (RemoteException e) {

                        Log.w(TAG_OPS, "Unable to enter stage split from the current running app");

                    }