From b5370b7f70e6fbf34a14f4e7edf711925cc0edae Mon Sep 17 00:00:00 2001
From: Matthew Ng <ngmatthew@google.com>
Date: Tue, 13 Dec 2016 18:01:22 -0800
Subject: [PATCH] Fixes minimized state in DividerController when dismissing
 docked stack

When dismiss docked stack is dimissed without going back to multiwindow
mode, it will not set the mMinimizedDock to false. It will then assume
all interactions as minimized mode. Some issues occur such as trying to
go back into multiwindow mode will fail (leave the docked task docked
while launcher is shown behind it). It is possible to trigger a docked
stack dimissal with Activity.finish() from an app while in minimized
mode.

Test: manual - manually dismissed dock stack and tried to go back into
multiwindow mode
Change-Id: I2a8af3e6b9ea70a85e89adc7be50f31527af5c80
---
 .../com/android/server/wm/DockedStackDividerController.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/wm/DockedStackDividerController.java b/services/core/java/com/android/server/wm/DockedStackDividerController.java
index f8b461eba7418..e6bc7f44ab0cd 100644
--- a/services/core/java/com/android/server/wm/DockedStackDividerController.java
+++ b/services/core/java/com/android/server/wm/DockedStackDividerController.java
@@ -390,9 +390,8 @@ public class DockedStackDividerController implements DimLayerUser {
                 inputMethodManagerInternal.hideCurrentInputMethod();
                 mImeHideRequested = true;
             }
-        } else if (setMinimizedDockedStack(false)) {
-            mService.mWindowPlacerLocked.performSurfacePlacement();
         }
+        setMinimizedDockedStack(false, false /* animate */);
     }
 
     /**