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

Commit 0c7c1509 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "ViewRootImpl: Correct opaque flag usage" into sc-dev am: a731c9f3 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14724164

Change-Id: Ib192fe790f96bf3224ba89240785f1255c368891
parents 30c467c6 a731c9f3

core/java/android/view/ViewRootImpl.java

+4 −3
Original line number Diff line number Diff line
@@ -2783,7 +2783,7 @@ public final class ViewRootImpl implements ViewParent, 
                        & WindowManagerGlobal.RELAYOUT_RES_DRAG_RESIZING_DOCKED) != 0;

                final boolean dragResizing = freeformResizing || dockedResizing;

                if (mSurfaceControl.isValid()) {

                    updateOpacity(params, dragResizing);

                    updateOpacity(mWindowAttributes, dragResizing);

                }



                if (DEBUG_LAYOUT) Log.v(mTag, "relayout: frame=" + frame.toShortString()
@@ -7749,9 +7749,10 @@ public final class ViewRootImpl implements ViewParent, 
        return relayoutResult;

    }



    private void updateOpacity(@Nullable WindowManager.LayoutParams params, boolean dragResizing) {

    private void updateOpacity(WindowManager.LayoutParams params, boolean dragResizing) {

        boolean opaque = false;

        if (params != null && !PixelFormat.formatHasAlpha(params.format)



        if (!PixelFormat.formatHasAlpha(params.format)

                // Don't make surface with surfaceInsets opaque as they display a

                // translucent shadow.

                && params.surfaceInsets.left == 0

libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/StartingSurfaceDrawer.java

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.content.pm.PackageManager; 
import android.content.res.Configuration;

import android.content.res.Resources;

import android.content.res.TypedArray;

import android.graphics.PixelFormat;

import android.graphics.Rect;

import android.hardware.display.DisplayManager;

import android.os.IBinder;
@@ -215,6 +216,7 @@ public class StartingSurfaceDrawer { 
                WindowManager.LayoutParams.TYPE_APPLICATION_STARTING);

        params.setFitInsetsSides(0);

        params.setFitInsetsTypes(0);

        params.format = PixelFormat.TRANSLUCENT;

        int windowFlags = WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED

                | WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS

                | WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN