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

Commit 09fa8395 authored by Evan Rosky's avatar Evan Rosky Committed by Android (Google) Code Review
Browse files

Merge "Remove some hard-coded fullscreen-specific hierarchy logic"

parents 3536d67e 7021370a

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

+0 −3
Original line number Diff line number Diff line
@@ -421,8 +421,6 @@ class ActivityStack extends WindowContainer<Task> implements BoundsAnimationTarg 
    /** Stores the override windowing-mode from before a transient mode change (eg. split) */

    private int mRestoreOverrideWindowingMode = WINDOWING_MODE_UNDEFINED;



    private final ActivityOptions mTmpOptions = ActivityOptions.makeBasic();



    /** List for processing through a set of activities */

    private final ArrayList<ActivityRecord> mTmpActivities = new ArrayList<>();
@@ -750,7 +748,6 @@ class ActivityStack extends WindowContainer<Task> implements BoundsAnimationTarg 
            // Leaving a transient mode. Interpret UNDEFINED as "restore"

            windowingMode = mRestoreOverrideWindowingMode;

        }

        mTmpOptions.setLaunchWindowingMode(windowingMode);



        // Need to make sure windowing mode is supported. If we in the process of creating the stack

        // no need to resolve the windowing mode again as it is already resolved to the right mode.

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

+1 −1
Original line number Diff line number Diff line
@@ -541,8 +541,8 @@ public class DisplayRotation { 
            }

            mService.mH.removeCallbacks(mDisplayRotationHandlerTimeout);

            mIsWaitingForRemoteRotation = false;

            mService.mAtmService.applyContainerTransaction(t);

            mDisplayContent.sendNewConfiguration();

            mService.mAtmService.applyContainerTransaction(t);

        }

    }

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

+28 −17
Original line number Diff line number Diff line
@@ -60,9 +60,7 @@ import static com.android.server.EventLogTags.WM_TASK_CREATED; 
import static com.android.server.EventLogTags.WM_TASK_REMOVED;

import static com.android.server.am.TaskRecordProto.ACTIVITIES;

import static com.android.server.am.TaskRecordProto.ACTIVITY_TYPE;

import static com.android.server.am.TaskRecordProto.BOUNDS;

import static com.android.server.am.TaskRecordProto.FULLSCREEN;

import static com.android.server.am.TaskRecordProto.ID;

import static com.android.server.am.TaskRecordProto.LAST_NON_FULLSCREEN_BOUNDS;

import static com.android.server.am.TaskRecordProto.MIN_HEIGHT;

import static com.android.server.am.TaskRecordProto.MIN_WIDTH;
@@ -89,10 +87,8 @@ import static com.android.server.wm.ActivityTaskManagerDebugConfig.TAG_WITH_CLAS 
import static com.android.server.wm.DragResizeMode.DRAG_RESIZE_MODE_DOCKED_DIVIDER;

import static com.android.server.wm.ProtoLogGroup.WM_DEBUG_ADD_REMOVE;

import static com.android.server.wm.TaskProto.APP_WINDOW_TOKENS;

import static com.android.server.wm.TaskProto.BOUNDS;

import static com.android.server.wm.TaskProto.DISPLAYED_BOUNDS;

import static com.android.server.wm.TaskProto.FILLS_PARENT;

import static com.android.server.wm.TaskProto.ID;

import static com.android.server.wm.TaskProto.SURFACE_HEIGHT;

import static com.android.server.wm.TaskProto.SURFACE_WIDTH;

import static com.android.server.wm.TaskProto.WINDOW_CONTAINER;
@@ -314,6 +310,7 @@ class Task extends WindowContainer<ActivityRecord> implements ConfigurationConta 
    private final Rect mTmpNonDecorBounds = new Rect();

    private final Rect mTmpBounds = new Rect();

    private final Rect mTmpInsets = new Rect();

    private final Rect mTmpFullBounds = new Rect();



    // Last non-fullscreen bounds the task was launched in or resized to.

    // The information is persisted and used to determine the appropriate stack to launch the
@@ -1673,7 +1670,9 @@ class Task extends WindowContainer<ActivityRecord> implements ConfigurationConta 
    }



    void adjustForMinimalTaskDimensions(Rect bounds, Rect previousBounds) {

        if (bounds == null) {

        final Rect parentBounds = getParent() != null ? getParent().getBounds() : null;

        if (bounds == null

                || (bounds.isEmpty() && (parentBounds == null || parentBounds.isEmpty()))) {

            return;

        }

        int minWidth = mMinWidth;
@@ -1697,6 +1696,14 @@ class Task extends WindowContainer<ActivityRecord> implements ConfigurationConta 
                minHeight = defaultMinSize;

            }

        }

        if (bounds.isEmpty()) {

            // If inheriting parent bounds, check if parent bounds adhere to minimum size. If they

            // do, we can just skip.

            if (parentBounds.width() >= minWidth && parentBounds.height() >= minHeight) {

                return;

            }

            bounds.set(parentBounds);

        }

        final boolean adjustWidth = minWidth > bounds.width();

        final boolean adjustHeight = minHeight > bounds.height();

        if (!(adjustWidth || adjustHeight)) {
@@ -1948,10 +1955,19 @@ class Task extends WindowContainer<ActivityRecord> implements ConfigurationConta 
        }

        density *= DisplayMetrics.DENSITY_DEFAULT_SCALE;



        final Rect bounds = inOutConfig.windowConfiguration.getBounds();

        final Rect resolvedBounds = inOutConfig.windowConfiguration.getBounds();

        if (resolvedBounds == null) {

            mTmpFullBounds.setEmpty();

        } else {

            mTmpFullBounds.set(resolvedBounds);

        }

        if (mTmpFullBounds.isEmpty()) {

            mTmpFullBounds.set(parentConfig.windowConfiguration.getBounds());

        }



        Rect outAppBounds = inOutConfig.windowConfiguration.getAppBounds();

        if (outAppBounds == null || outAppBounds.isEmpty()) {

            inOutConfig.windowConfiguration.setAppBounds(bounds);

            inOutConfig.windowConfiguration.setAppBounds(mTmpFullBounds);

            outAppBounds = inOutConfig.windowConfiguration.getAppBounds();

        }

        // Non-null compatibility insets means the activity prefers to keep its original size, so
@@ -1974,7 +1990,7 @@ class Task extends WindowContainer<ActivityRecord> implements ConfigurationConta 
                // area, i.e. the screen area without the system bars.

                // The non decor inset are areas that could never be removed in Honeycomb. See

                // {@link WindowManagerPolicy#getNonDecorInsetsLw}.

                calculateInsetFrames(mTmpNonDecorBounds, mTmpStableBounds, bounds, di);

                calculateInsetFrames(mTmpNonDecorBounds, mTmpStableBounds, mTmpFullBounds, di);

            } else {

                // Apply the given non-decor and stable insets to calculate the corresponding bounds

                // for screen size of configuration.
@@ -1983,8 +1999,8 @@ class Task extends WindowContainer<ActivityRecord> implements ConfigurationConta 
                    rotation = parentConfig.windowConfiguration.getRotation();

                }

                if (rotation != ROTATION_UNDEFINED && compatInsets != null) {

                    mTmpNonDecorBounds.set(bounds);

                    mTmpStableBounds.set(bounds);

                    mTmpNonDecorBounds.set(mTmpFullBounds);

                    mTmpStableBounds.set(mTmpFullBounds);

                    compatInsets.getDisplayBoundsByRotation(mTmpBounds, rotation);

                    intersectWithInsetsIfFits(mTmpNonDecorBounds, mTmpBounds,

                            compatInsets.mNonDecorInsets[rotation]);
@@ -2016,13 +2032,13 @@ class Task extends WindowContainer<ActivityRecord> implements ConfigurationConta 
                if (WindowConfiguration.isFloating(windowingMode)) {

                    // For floating tasks, calculate the smallest width from the bounds of the task

                    inOutConfig.smallestScreenWidthDp = (int) (

                            Math.min(bounds.width(), bounds.height()) / density);

                            Math.min(mTmpFullBounds.width(), mTmpFullBounds.height()) / density);

                } else if (WindowConfiguration.isSplitScreenWindowingMode(windowingMode)) {

                    // Iterating across all screen orientations, and return the minimum of the task

                    // width taking into account that the bounds might change because the snap

                    // algorithm snaps to a different value

                    inOutConfig.smallestScreenWidthDp =

                            getSmallestScreenWidthDpForDockedBounds(bounds);

                            getSmallestScreenWidthDpForDockedBounds(mTmpFullBounds);

                }

                // otherwise, it will just inherit

            }
@@ -2067,11 +2083,6 @@ class Task extends WindowContainer<ActivityRecord> implements ConfigurationConta 
                    newParentConfig.orientation);

        }



        if (outOverrideBounds.isEmpty()) {

            // If the task fills the parent, just inherit all the other configs from parent.

            return;

        }



        adjustForMinimalTaskDimensions(outOverrideBounds, mTmpBounds);

        if (windowingMode == WINDOWING_MODE_FREEFORM) {

            // by policy, make sure the window remains within parent somewhere

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

+2 −1
Original line number Diff line number Diff line
@@ -284,7 +284,8 @@ class TaskLaunchParamsModifier implements LaunchParamsModifier { 
                    && outParams.mBounds.isEmpty()

                    && source.getDisplayId() == display.mDisplayId) {

                // Set bounds to be not very far from source activity.

                cascadeBounds(source.getBounds(), display, outParams.mBounds);

                cascadeBounds(source.getConfiguration().windowConfiguration.getBounds(),

                        display, outParams.mBounds);

            }

            getTaskBounds(root, display, layout, resolvedMode, hasInitialBounds, outParams.mBounds);

        }

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

+10 −0
Original line number Diff line number Diff line
@@ -106,6 +106,16 @@ public class WindowFrames { 
     */

    final Rect mLastFrame = new Rect();



    /**

     * mFrame but relative to the parent container.

     */

    final Rect mRelFrame = new Rect();



    /**

     * mLastFrame but relative to the parent container

     */

    final Rect mLastRelFrame = new Rect();



    private boolean mFrameSizeChanged = false;



    // Frame that is scaled to the application's coordinate space when in