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

Commit 02449404 authored by Andrii Kulian's avatar Andrii Kulian Committed by android-build-merger
Browse files

Merge "Limit black background to only base and starting windows" into oc-dr1-dev 

am: 44cab75c

Change-Id: I87966d38e8b23441837760db1e17e2957468adfa
parents c164123c 44cab75c

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

+3 −5
Original line number Diff line number Diff line
@@ -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;