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

Commit 8dc8f4a9 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by android-build-merger
Browse files

Merge "Merge "Fix minimized state messup" into nyc-dev am: dce92891 am:... 

Merge "Merge "Fix minimized state messup" into nyc-dev am: dce92891 am: 7f5e29b2" into nyc-mr1-dev-plus-aosp
am: 9d512758

* commit '9d512758':
  Fix minimized state messup

Change-Id: I89ddcb18f9061d8110006d2acaa1966122a9f578
parents a6b062d6 9d512758

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

+4 −2
Original line number Diff line number Diff line
@@ -378,6 +378,9 @@ public class DockedStackDividerController implements DimLayerUser { 
    }



    private void checkMinimizeChanged(boolean animate) {

        if (mDisplayContent.getDockedStackVisibleForUserLocked() == null) {

            return;

        }

        final TaskStack homeStack = mDisplayContent.getHomeStack();

        if (homeStack == null) {

            return;
@@ -412,8 +415,7 @@ public class DockedStackDividerController implements DimLayerUser { 
    private void setMinimizedDockedStack(boolean minimizedDock, boolean animate) {

        final boolean wasMinimized = mMinimizedDock;

        mMinimizedDock = minimizedDock;

        if (minimizedDock == wasMinimized

                || mDisplayContent.getDockedStackVisibleForUserLocked() == null) {

        if (minimizedDock == wasMinimized) {

            return;

        }