diff options
| author | 2015-09-21 14:02:43 +0000 | |
|---|---|---|
| committer | 2015-09-21 14:02:43 +0000 | |
| commit | 1f66ec8b908bb37c342c8bf97f74ecce913bfcc3 (patch) | |
| tree | 54465aad4d3f5f05affb215e70dba23ef5d40ab6 | |
| parent | c89f3a483330498d69a6c706b78c3a0aea5298a0 (diff) | |
| parent | e82f3c977cc52c27178486cd45c43861e86ad050 (diff) | |
Merge "Allows starting window to be shown for swipe-dismiss windows." into cw-e-dev
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowManagerService.java | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index f47b4d836165..2166e7e8a843 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -4440,13 +4440,8 @@ public class WindowManagerService extends IWindowManager.Stub + " ShowWallpaper=" + ent.array.getBoolean( com.android.internal.R.styleable.Window_windowShowWallpaper, false)); - final boolean windowIsTranslucentDefined = ent.array.hasValue( - com.android.internal.R.styleable.Window_windowIsTranslucent); - final boolean windowIsTranslucent = ent.array.getBoolean( - com.android.internal.R.styleable.Window_windowIsTranslucent, false); - final boolean windowSwipeToDismiss = ent.array.getBoolean( - com.android.internal.R.styleable.Window_windowSwipeToDismiss, false); - if (windowIsTranslucent || (!windowIsTranslucentDefined && windowSwipeToDismiss)) { + if (ent.array.getBoolean( + com.android.internal.R.styleable.Window_windowIsTranslucent, false)) { return; } if (ent.array.getBoolean( |