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

Commit 32bcb10e authored by Robert Carr's avatar Robert Carr
Browse files

Restore pinned stack shadows. 

We use the approach of outsetting the stack bounds and then
insetting windows which don't have surfaceInsets by said outsets.

Test: Manual. go/wm-smoke
Bug: 72657549
Change-Id: I9ac7e13ec696f88f02794175d0d44ac870f91d33
parent f0586626

core/java/android/app/WindowConfiguration.java

+3 −0
Original line number Diff line number Diff line
@@ -146,6 +146,9 @@ public class WindowConfiguration implements Parcelable, Comparable<WindowConfigu 
    })

    public @interface WindowConfig {}



    /** @hide */

    public static final int PINNED_WINDOWING_MODE_ELEVATION_IN_DIP = 5;



    public WindowConfiguration() {

        unset();

    }

core/java/com/android/internal/policy/DecorView.java

+2 −1
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ import android.view.animation.Interpolator; 
import android.widget.FrameLayout;

import android.widget.PopupWindow;



import static android.app.WindowConfiguration.PINNED_WINDOWING_MODE_ELEVATION_IN_DIP;

import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;

import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;

import static android.content.res.Configuration.ORIENTATION_PORTRAIT;
@@ -2216,7 +2217,7 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind 
            elevation = dipToPx(elevation);

            mElevationAdjustedForStack = true;

        } else if (windowingMode == WINDOWING_MODE_PINNED) {

            elevation = dipToPx(DECOR_SHADOW_UNFOCUSED_HEIGHT_IN_DIP);

            elevation = dipToPx(PINNED_WINDOWING_MODE_ELEVATION_IN_DIP);

            mElevationAdjustedForStack = true;

        } else {

            mElevationAdjustedForStack = false;

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

+30 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static android.app.ActivityManager.SPLIT_SCREEN_CREATE_MODE_TOP_OR_LEFT; 
import static android.app.WindowConfiguration.ACTIVITY_TYPE_ASSISTANT;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS;

import static android.app.WindowConfiguration.PINNED_WINDOWING_MODE_ELEVATION_IN_DIP;

import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;

import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSET;

import static android.content.res.Configuration.DENSITY_DPI_UNDEFINED;
@@ -53,6 +54,7 @@ import android.graphics.Point; 
import android.graphics.Rect;

import android.graphics.Region;

import android.os.RemoteException;

import android.util.DisplayMetrics;

import android.util.EventLog;

import android.util.Slog;

import android.util.SparseArray;
@@ -741,14 +743,32 @@ public class TaskStack extends WindowContainer<Task> implements 
        scheduleAnimation();

    }



    /**

     * Calculate an amount by which to expand the stack bounds in each direction.

     * Used to make room for shadows in the pinned windowing mode.

     */

    int getStackOutset() {

        if (inPinnedWindowingMode()) {

            final DisplayMetrics displayMetrics = getDisplayContent().getDisplayMetrics();

            return mService.dipToPixel(PINNED_WINDOWING_MODE_ELEVATION_IN_DIP,

                    displayMetrics);

        }

        return 0;

    }



    private void updateSurfaceSize(SurfaceControl.Transaction transaction) {

        if (mSurfaceControl == null) {

            return;

        }



        final Rect stackBounds = getBounds();

        final int width = stackBounds.width();

        final int height = stackBounds.height();

        int width = stackBounds.width();

        int height = stackBounds.height();



        final int outset = getStackOutset();

        width += 2*outset;

        height += 2*outset;



        if (width == mLastSurfaceSize.x && height == mLastSurfaceSize.y) {

            return;

        }
@@ -1749,4 +1769,12 @@ public class TaskStack extends WindowContainer<Task> implements 
        mDimmer.stopDim(getPendingTransaction());

        scheduleAnimation();

    }



    @Override

    void getRelativePosition(Point outPos) {

        super.getRelativePosition(outPos);

        final int outset = getStackOutset();

        outPos.x -= outset;

        outPos.y -= outset;

    }

}

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

+11 −0
Original line number Diff line number Diff line
@@ -4576,6 +4576,17 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
            outPoint.offset(-parentBounds.left, -parentBounds.top);

        }



        TaskStack stack = getStack();



        // If we have stack outsets, that means the top-left

        // will be outset, and we need to inset ourselves

        // to account for it. If we actually have shadows we will

        // then un-inset ourselves by the surfaceInsets.

        if (stack != null) {

            final int outset = stack.getStackOutset();

            outPoint.offset(outset, outset);

        }



        // Expand for surface insets. See WindowState.expandForSurfaceInsets.

        outPoint.offset(-mAttrs.surfaceInsets.left, -mAttrs.surfaceInsets.top);

    }