Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31bd01a1 authored by Gus Prevas's avatar Gus Prevas Committed by Android Git Automerger
Browse files

am 448ada62: am 1f66ec8b: Merge "Allows starting window to be shown for... 

am 448ada62: am 1f66ec8b: Merge "Allows starting window to be shown for swipe-dismiss windows." into cw-e-dev

* commit '448ada62':
  Allows starting window to be shown for swipe-dismiss windows.
parents 5bcd4477 448ada62

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

+2 −7
Original line number Diff line number Diff line
@@ -4441,13 +4441,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(