commit 8dd32a56f74b896b21895ec75d58fa415caa2c70
author Rob Carr <racarr@google.com> Mon Apr 18 18:10:56 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 18 18:10:58 2016 +0000
tree 2f5bdd04d493a1337b87e0e784778bb495e10077
parent 36ac7e9f88e43a518b9670f556c011cb3d8f236f
parent 7393c7b3ec4230f2dc2caf4c6a8c25dfcf6a5b91

Merge "Always update DimLayer bounds when starting dim." into nyc-dev

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

diff --git a/services/core/java/com/android/server/wm/DimLayerController.java b/services/core/java/com/android/server/wm/DimLayerController.java
index c240d07..52146c2 100644
--- a/services/core/java/com/android/server/wm/DimLayerController.java
+++ b/services/core/java/com/android/server/wm/DimLayerController.java
@@ -149,8 +149,10 @@
             if (state.animator.mWin.mAppToken == null && !dimLayerUser.isFullscreen()) {
                 // Dim should cover the entire screen for system windows.
                 mDisplayContent.getLogicalDisplayRect(mTmpBounds);
-                state.dimLayer.setBounds(mTmpBounds);
+            } else {
+                dimLayerUser.getDimBounds(mTmpBounds);
             }
+            state.dimLayer.setBounds(mTmpBounds);
         }
     }