Merge "Merge "Fix minimized state messup" into nyc-dev am: dce92891df am:... (9d512758) · Commits · e / os / android_frameworks_base

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;
		}