Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix minimized state messup" into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-05-06 23:58:27 +00:00
committed by Android (Google) Code Review
parent 52b952a296 817a52441f
commit dce92891df
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/wm/DockedStackDividerController.java
View File

@@ -378,6 +378,9 @@ public class DockedStackDividerController implements DimLayerUser {
} }
private void checkMinimizeChanged(boolean animate) { private void checkMinimizeChanged(boolean animate) {
if (mDisplayContent.getDockedStackVisibleForUserLocked() == null) {
return;
}
final TaskStack homeStack = mDisplayContent.getHomeStack(); final TaskStack homeStack = mDisplayContent.getHomeStack();
if (homeStack == null) { if (homeStack == null) {
return; return;
@@ -412,8 +415,7 @@ public class DockedStackDividerController implements DimLayerUser {
private void setMinimizedDockedStack(boolean minimizedDock, boolean animate) { private void setMinimizedDockedStack(boolean minimizedDock, boolean animate) {
final boolean wasMinimized = mMinimizedDock; final boolean wasMinimized = mMinimizedDock;
mMinimizedDock = minimizedDock; mMinimizedDock = minimizedDock;
if (minimizedDock == wasMinimized if (minimizedDock == wasMinimized) {
|| mDisplayContent.getDockedStackVisibleForUserLocked() == null) {
return; return;
} }