diff options
| author | Andrii Kulian <akulian@google.com> | 2017-08-16 06:20:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-08-16 06:20:59 +0000 |
| commit | 44cab75cb0ec40368597180e06d6d037a76ef41a (patch) | |
| tree | 474b5d19bf9c08ec0a9c12a1295cb5fde08aa52f | |
| parent | 87a264dfdeef1c638095bde254ac6659e440172e (diff) | |
| parent | e3332341c34893eafbb1c3cd786f1e3779c79411 (diff) | |
| download | base-44cab75cb0ec40368597180e06d6d037a76ef41a.tar.gz | |
Merge "Limit black background to only base and starting windows" into oc-dr1-dev
| -rw-r--r-- | services/core/java/com/android/server/wm/SurfaceControlWithBackground.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/services/core/java/com/android/server/wm/SurfaceControlWithBackground.java b/services/core/java/com/android/server/wm/SurfaceControlWithBackground.java index 3603f2ffeed2..b0eaf1488f21 100644 --- a/services/core/java/com/android/server/wm/SurfaceControlWithBackground.java +++ b/services/core/java/com/android/server/wm/SurfaceControlWithBackground.java @@ -26,9 +26,8 @@ import android.view.Surface.OutOfResourcesException; import android.view.SurfaceControl; import android.view.SurfaceSession; -import static android.view.WindowManager.LayoutParams.FIRST_APPLICATION_WINDOW; -import static android.view.WindowManager.LayoutParams.LAST_APPLICATION_WINDOW; import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_STARTING; +import static android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION; import static android.view.WindowManagerPolicy.NAV_BAR_BOTTOM; import static android.view.WindowManagerPolicy.NAV_BAR_LEFT; import static android.view.WindowManagerPolicy.NAV_BAR_RIGHT; @@ -73,9 +72,8 @@ class SurfaceControlWithBackground extends SurfaceControl { super(s, name, w, h, format, flags, windowType, ownerUid); // We should only show background behind app windows that are letterboxed in a task. - if (!windowSurfaceController.mAnimator.mWin.isLetterboxedAppWindow() - || windowType < FIRST_APPLICATION_WINDOW - || windowType > LAST_APPLICATION_WINDOW) { + if ((windowType != TYPE_BASE_APPLICATION && windowType != TYPE_APPLICATION_STARTING) + || !windowSurfaceController.mAnimator.mWin.isLetterboxedAppWindow()) { return; } mWindowSurfaceController = windowSurfaceController; |