diff options
| author | Craig Mautner <cmautner@google.com> | 2012-04-24 14:35:10 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-24 14:35:10 -0700 |
| commit | bdb1c4067c2453672652730d12466dc17ff4a120 (patch) | |
| tree | 6f0c0fd48f83477bd193f411d55e1b352a175a8d | |
| parent | 3a220884249259961a43c35983d915201192f21a (diff) | |
| parent | 35af2fff433e6f83f70b8bb15b3bf4fc19d13104 (diff) | |
| download | frameworks_base-bdb1c4067c2453672652730d12466dc17ff4a120.zip frameworks_base-bdb1c4067c2453672652730d12466dc17ff4a120.tar.gz frameworks_base-bdb1c4067c2453672652730d12466dc17ff4a120.tar.bz2 | |
Merge "Don't start a dimming operation when hiding."
| -rwxr-xr-x | services/java/com/android/server/wm/WindowManagerService.java | 3 |
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); |