summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2012-04-24 14:30:15 -0700
committerCraig Mautner <cmautner@google.com>2012-04-24 14:30:15 -0700
commit35af2fff433e6f83f70b8bb15b3bf4fc19d13104 (patch)
tree94245be0f08fec5a20b149f26b05c3cca841901c /services
parent69c1a571acefc59d7260e6c805801656923b1330 (diff)
downloadframeworks_base-35af2fff433e6f83f70b8bb15b3bf4fc19d13104.zip
frameworks_base-35af2fff433e6f83f70b8bb15b3bf4fc19d13104.tar.gz
frameworks_base-35af2fff433e6f83f70b8bb15b3bf4fc19d13104.tar.bz2
Don't start a dimming operation when hiding.
Check to see if app token is hiding before going ahead with turning on dimming. Before this fix went in we were turning dimming back on right after turning it off. Then we didn't turn it off again until all animations had completed leading to a delayed dim-off experience. Fixes bug 6378033. Change-Id: Ic819a0093ba95f62df369266c07525835703c5fa
Diffstat (limited to 'services')
-rwxr-xr-xservices/java/com/android/server/wm/WindowManagerService.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java
index 1f7b297..defe824 100755
--- a/services/java/com/android/server/wm/WindowManagerService.java
+++ b/services/java/com/android/server/wm/WindowManagerService.java
@@ -8172,7 +8172,8 @@ public class WindowManagerService extends IWindowManager.Stub
// so we want to leave all of them as undimmed (for
// performance reasons).
mInnerFields.mObscured = true;
- } else if (canBeSeen && (attrFlags & FLAG_DIM_BEHIND) != 0) {
+ } else if (canBeSeen && (attrFlags & FLAG_DIM_BEHIND) != 0
+ && !(w.mAppToken != null && w.mAppToken.hiddenRequested)) {
if (localLOGV) Slog.v(TAG, "Win " + w + " obscured=" + mInnerFields.mObscured);
if (!mInnerFields.mDimming) {
//Slog.i(TAG, "DIM BEHIND: " + w);