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

Commit d449dae5 authored by Chong Zhang's avatar Chong Zhang Committed by android-build-merger
Browse files

Merge "Update dock stack create mode after rotation if dock side changed" into nyc-dev 

am: e55e4b7f

* commit 'e55e4b7f':
  Update dock stack create mode after rotation if dock side changed

Change-Id: I6e0b7bd1775c7968c36b0ec0d470be8bde363c73
parents 1c503aa1 e55e4b7f

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

+8 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.server.wm;



import static android.app.ActivityManager.DOCKED_STACK_CREATE_MODE_TOP_OR_LEFT;

import static android.app.ActivityManager.DOCKED_STACK_CREATE_MODE_BOTTOM_OR_RIGHT;

import static android.app.ActivityManager.StackId.DOCKED_STACK_ID;

import static android.app.ActivityManager.StackId.HOME_STACK_ID;

import static android.app.ActivityManager.StackId.PINNED_STACK_ID;
@@ -403,6 +404,13 @@ public class TaskStack implements DimLayer.DimLayerUser, 
            snapDockedStackAfterRotation(mTmpRect2);

            final int newDockSide = getDockSide(mTmpRect2);

            if (oldDockSide != newDockSide) {

                // Update the dock create mode and clear the dock create bounds, these

                // might change after a rotation and the original values will be invalid.

                mService.setDockedStackCreateStateLocked(

                        (newDockSide == DOCKED_LEFT || newDockSide == DOCKED_TOP)

                        ? DOCKED_STACK_CREATE_MODE_TOP_OR_LEFT

                        : DOCKED_STACK_CREATE_MODE_BOTTOM_OR_RIGHT,

                        null);

                mDisplayContent.getDockedDividerController().notifyDockSideChanged(newDockSide);

            }

        }

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

+6 −2
Original line number Diff line number Diff line
@@ -4959,10 +4959,14 @@ public class WindowManagerService extends IWindowManager.Stub 


    public void setDockedStackCreateState(int mode, Rect bounds) {

        synchronized (mWindowMap) {

            setDockedStackCreateStateLocked(mode, bounds);

        }

    }



    void setDockedStackCreateStateLocked(int mode, Rect bounds) {

        mDockedStackCreateMode = mode;

        mDockedStackCreateBounds = bounds;

    }

    }



    /**

     * Create a new TaskStack and place it on a DisplayContent.