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 
am: dce92891df

* commit 'dce92891df42d5ad8cdcb6ecade5b2801a14f090':
  Fix minimized state messup

Change-Id: I8aba9be1767593da365c3192bfaa89821f8bf527
This commit is contained in:
Jorim Jaggi
2016-05-07 00:07:58 +00:00
committed by android-build-merger
parent 92529363d0 dce92891df
commit 7f5e29b255
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) {
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;
}