summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Carr <racarr@google.com>2016-04-18 18:10:56 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-04-18 18:10:58 +0000
commit8dd32a56f74b896b21895ec75d58fa415caa2c70 (patch)
tree2f5bdd04d493a1337b87e0e784778bb495e10077
parent36ac7e9f88e43a518b9670f556c011cb3d8f236f (diff)
parent7393c7b3ec4230f2dc2caf4c6a8c25dfcf6a5b91 (diff)
Merge "Always update DimLayer bounds when starting dim." into nyc-dev
-rw-r--r--services/core/java/com/android/server/wm/DimLayerController.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/DimLayerController.java b/services/core/java/com/android/server/wm/DimLayerController.java
index c240d0733a0a..52146c2c61da 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 @@ class DimLayerController {
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);
}
}