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

Commit 7da0ac29 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Automerger Merge Worker
Browse files

Merge "Use correct bounds when calculating systemui visibility" into rvc-dev am: 25e19732 

Change-Id: Ib403ec0d860879495d0f2feddd0a8d82c875ffb1
parents cd1bc2fa 25e19732

services/core/java/com/android/server/policy/WindowManagerPolicy.java

+0 −6
Original line number Original line Diff line number Diff line
@@ -541,12 +541,6 @@ public interface WindowManagerPolicy extends WindowManagerPolicyConstants { 
        /** Unregister a system listener for touch events */

        /** Unregister a system listener for touch events */

        void unregisterPointerEventListener(PointerEventListener listener, int displayId);

        void unregisterPointerEventListener(PointerEventListener listener, int displayId);





        /**

         * Retrieves the {@param outBounds} from the stack matching the {@param windowingMode} and

         * {@param activityType}.

         */

        void getStackBounds(int windowingMode, int activityType, Rect outBounds);



        /**

        /**

         * @return The currently active input method window.

         * @return The currently active input method window.

         */

         */

services/core/java/com/android/server/wm/DisplayPolicy.java

+8 −3
Original line number Original line Diff line number Diff line
@@ -3246,9 +3246,14 @@ public class DisplayPolicy { 
                mTopFullscreenOpaqueWindowState, mTopFullscreenOpaqueOrDimmingWindowState);

                mTopFullscreenOpaqueWindowState, mTopFullscreenOpaqueOrDimmingWindowState);

        final int dockedAppearance = updateLightStatusBarAppearanceLw(0 /* vis */,

        final int dockedAppearance = updateLightStatusBarAppearanceLw(0 /* vis */,

                mTopDockedOpaqueWindowState, mTopDockedOpaqueOrDimmingWindowState);

                mTopDockedOpaqueWindowState, mTopDockedOpaqueOrDimmingWindowState);

        mService.getStackBounds(

        final boolean inSplitScreen =

                WINDOWING_MODE_SPLIT_SCREEN_PRIMARY, ACTIVITY_TYPE_STANDARD, mDockedStackBounds);

                mService.mRoot.getDefaultDisplay().mTaskContainers.isSplitScreenModeActivated();

        final boolean inSplitScreen = !mDockedStackBounds.isEmpty();

        if (inSplitScreen) {

            mService.getStackBounds(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY, ACTIVITY_TYPE_STANDARD,

                    mDockedStackBounds);

        } else {

            mDockedStackBounds.setEmpty();

        }

        mService.getStackBounds(inSplitScreen ? WINDOWING_MODE_SPLIT_SCREEN_SECONDARY

        mService.getStackBounds(inSplitScreen ? WINDOWING_MODE_SPLIT_SCREEN_SECONDARY

                        : WINDOWING_MODE_FULLSCREEN,

                        : WINDOWING_MODE_FULLSCREEN,

                ACTIVITY_TYPE_UNDEFINED, mNonDockedStackBounds);

                ACTIVITY_TYPE_UNDEFINED, mNonDockedStackBounds);

services/core/java/com/android/server/wm/WindowManagerService.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -2780,7 +2780,6 @@ public class WindowManagerService extends IWindowManager.Stub 
                aspectRatio);

                aspectRatio);

    }

    }





    @Override

    public void getStackBounds(int windowingMode, int activityType, Rect bounds) {

    public void getStackBounds(int windowingMode, int activityType, Rect bounds) {

        synchronized (mGlobalLock) {

        synchronized (mGlobalLock) {

            final ActivityStack stack = mRoot.getStack(windowingMode, activityType);

            final ActivityStack stack = mRoot.getStack(windowingMode, activityType);