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

Commit 64563cf7 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9358956 from 8c526510 to tm-qpr2-release 

Change-Id: I1bff2ef2ef55df5682214ac52baa7381f6da21e6
parents 4b85d9ce 8c526510

core/java/android/view/IWindowManager.aidl

+1 −2
Original line number Diff line number Diff line
@@ -727,9 +727,8 @@ interface IWindowManager 
     * If invoked through a package other than a launcher app, returns an empty list.

     *

     * @param displayId the id of the logical display

     * @param packageName the name of the calling package

     */

    List<DisplayInfo> getPossibleDisplayInfo(int displayId, String packageName);

    List<DisplayInfo> getPossibleDisplayInfo(int displayId);



    /**

     * Called to show global actions.

core/java/android/view/WindowManagerImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ public final class WindowManagerImpl implements WindowManager { 
        List<DisplayInfo> possibleDisplayInfos;

        try {

            possibleDisplayInfos = WindowManagerGlobal.getWindowManagerService()

                    .getPossibleDisplayInfo(displayId, mContext.getPackageName());

                    .getPossibleDisplayInfo(displayId);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskListener.java

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ public class FreeformTaskListener implements ShellTaskOrganizer.TaskListener { 
        mTasks.put(taskInfo.taskId, state);

        if (!Transitions.ENABLE_SHELL_TRANSITIONS) {

            SurfaceControl.Transaction t = new SurfaceControl.Transaction();

            mWindowDecorationViewModel.createWindowDecoration(taskInfo, leash, t, t);

            mWindowDecorationViewModel.onTaskOpening(taskInfo, leash, t, t);

            t.apply();

        }

libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskTransitionObserver.java

+7 −15
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ public class FreeformTaskTransitionObserver implements Transitions.TransitionObs 
            TransitionInfo.Change change,

            SurfaceControl.Transaction startT,

            SurfaceControl.Transaction finishT) {

        mWindowDecorViewModel.createWindowDecoration(

        mWindowDecorViewModel.onTaskOpening(

                change.getTaskInfo(), change.getLeash(), startT, finishT);

    }
@@ -128,32 +128,24 @@ public class FreeformTaskTransitionObserver implements Transitions.TransitionObs 
            TransitionInfo.Change change,

            SurfaceControl.Transaction startT,

            SurfaceControl.Transaction finishT) {

        mWindowDecorViewModel.setupWindowDecorationForTransition(

                change.getTaskInfo(), startT, finishT);

        mWindowDecorViewModel.onTaskClosing(change.getTaskInfo(), startT, finishT);

    }



    private void onChangeTransitionReady(

            TransitionInfo.Change change,

            SurfaceControl.Transaction startT,

            SurfaceControl.Transaction finishT) {

        mWindowDecorViewModel.setupWindowDecorationForTransition(

                change.getTaskInfo(), startT, finishT);

        mWindowDecorViewModel.onTaskChanging(

                change.getTaskInfo(), change.getLeash(), startT, finishT);

    }



    private void onToFrontTransitionReady(

            TransitionInfo.Change change,

            SurfaceControl.Transaction startT,

            SurfaceControl.Transaction finishT) {

        boolean exists = mWindowDecorViewModel.setupWindowDecorationForTransition(

                change.getTaskInfo(),

                startT,

                finishT);

        if (!exists) {

            // Window caption does not exist, create it

            mWindowDecorViewModel.createWindowDecoration(

        mWindowDecorViewModel.onTaskChanging(

                change.getTaskInfo(), change.getLeash(), startT, finishT);

    }

    }



    @Override

    public void onTransitionStarting(@NonNull IBinder transition) {}

libs/WindowManager/Shell/src/com/android/wm/shell/fullscreen/FullscreenTaskListener.java

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ public class FullscreenTaskListener implements ShellTaskOrganizer.TaskListener { 
        if (mWindowDecorViewModelOptional.isPresent()) {

            SurfaceControl.Transaction t = new SurfaceControl.Transaction();

            createdWindowDecor = mWindowDecorViewModelOptional.get()

                    .createWindowDecoration(taskInfo, leash, t, t);

                    .onTaskOpening(taskInfo, leash, t, t);

            t.apply();

        }

        if (!createdWindowDecor) {