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

Commit 0bd33674 authored by Garfield Tan's avatar Garfield Tan Committed by Android (Google) Code Review
Browse files

Merge "Move utilities in LPMUtils to LPUtil" into main

parents 4e1de135 0905d65e

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

+2 −2
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ package com.android.server.wm; 


import static com.android.server.wm.ActivityTaskManagerDebugConfig.TAG_ATM;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.TAG_WITH_CLASS_NAME;

import static com.android.server.wm.LaunchParamsModifierUtils.applyLayoutGravity;

import static com.android.server.wm.LaunchParamsModifierUtils.calculateLayoutBounds;

import static com.android.server.wm.LaunchParamsUtil.applyLayoutGravity;

import static com.android.server.wm.LaunchParamsUtil.calculateLayoutBounds;



import android.annotation.NonNull;

import android.annotation.Nullable;

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

deleted100644 → 0
+0 −102
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.server.wm;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.content.pm.ActivityInfo;

import android.graphics.Rect;

import android.util.Size;

import android.view.Gravity;



class LaunchParamsModifierUtils {



    /**

     * Calculates bounds based on window layout size manifest values. These can include width,

     * height, width fraction and height fraction. In the event only one dimension of values are

     * specified in the manifest (e.g. width but no height value), the corresponding display area

     * dimension will be used as the default value unless some desired sizes have been specified.

     */

    static void calculateLayoutBounds(@NonNull Rect stableBounds,

            @NonNull ActivityInfo.WindowLayout windowLayout, @NonNull Rect inOutBounds,

            @Nullable Size desiredSize) {

        final int defaultWidth = stableBounds.width();

        final int defaultHeight = stableBounds.height();

        int width;

        int height;



        if (desiredSize == null) {

            // If desired bounds have not been specified, use the exiting default bounds as the

            // desired.

            desiredSize = new Size(stableBounds.width(), stableBounds.height());

        }



        width = desiredSize.getWidth();

        if (windowLayout.width > 0 && windowLayout.width < defaultWidth) {

            width = windowLayout.width;

        } else if (windowLayout.widthFraction > 0 && windowLayout.widthFraction < 1.0f) {

            width = (int) (defaultWidth * windowLayout.widthFraction);

        }



        height = desiredSize.getHeight();

        if (windowLayout.height > 0 && windowLayout.height < defaultHeight) {

            height = windowLayout.height;

        } else if (windowLayout.heightFraction > 0 && windowLayout.heightFraction < 1.0f) {

            height = (int) (defaultHeight * windowLayout.heightFraction);

        }



        inOutBounds.set(0, 0, width, height);

    }



    /**

     * Applies a vertical and horizontal gravity on the inOutBounds in relation to the stableBounds.

     */

    static void applyLayoutGravity(int verticalGravity, int horizontalGravity,

            @NonNull Rect inOutBounds, @NonNull Rect stableBounds) {

        final int width = inOutBounds.width();

        final int height = inOutBounds.height();



        final float fractionOfHorizontalOffset;

        switch (horizontalGravity) {

            case Gravity.LEFT:

                fractionOfHorizontalOffset = 0f;

                break;

            case Gravity.RIGHT:

                fractionOfHorizontalOffset = 1f;

                break;

            default:

                fractionOfHorizontalOffset = 0.5f;

        }



        final float fractionOfVerticalOffset;

        switch (verticalGravity) {

            case Gravity.TOP:

                fractionOfVerticalOffset = 0f;

                break;

            case Gravity.BOTTOM:

                fractionOfVerticalOffset = 1f;

                break;

            default:

                fractionOfVerticalOffset = 0.5f;

        }



        inOutBounds.offsetTo(stableBounds.left, stableBounds.top);

        final int xOffset = (int) (fractionOfHorizontalOffset * (stableBounds.width() - width));

        final int yOffset = (int) (fractionOfVerticalOffset * (stableBounds.height() - height));

        inOutBounds.offset(xOffset, yOffset);

    }

}

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

+77 −0
Original line number Diff line number Diff line
@@ -23,9 +23,11 @@ import static com.android.server.wm.ActivityTaskManagerDebugConfig.TAG_ATM; 
import static com.android.server.wm.ActivityTaskManagerDebugConfig.TAG_WITH_CLASS_NAME;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.content.pm.ActivityInfo;

import android.graphics.Rect;

import android.util.Size;

import android.view.Gravity;

import android.view.View;



/**
@@ -195,4 +197,79 @@ class LaunchParamsUtil { 
        }

        inOutBounds.offset(dx, dy);

    }



    /**

     * Calculates bounds based on window layout size manifest values. These can include width,

     * height, width fraction and height fraction. In the event only one dimension of values are

     * specified in the manifest (e.g. width but no height value), the corresponding display area

     * dimension will be used as the default value unless some desired sizes have been specified.

     */

    static void calculateLayoutBounds(@NonNull Rect stableBounds,

            @NonNull ActivityInfo.WindowLayout windowLayout, @NonNull Rect inOutBounds,

            @Nullable Size desiredSize) {

        final int defaultWidth = stableBounds.width();

        final int defaultHeight = stableBounds.height();

        int width;

        int height;



        if (desiredSize == null) {

            // If desired bounds have not been specified, use the exiting default bounds as the

            // desired.

            desiredSize = new Size(stableBounds.width(), stableBounds.height());

        }



        width = desiredSize.getWidth();

        if (windowLayout.width > 0 && windowLayout.width < defaultWidth) {

            width = windowLayout.width;

        } else if (windowLayout.widthFraction > 0 && windowLayout.widthFraction < 1.0f) {

            width = (int) (defaultWidth * windowLayout.widthFraction);

        }



        height = desiredSize.getHeight();

        if (windowLayout.height > 0 && windowLayout.height < defaultHeight) {

            height = windowLayout.height;

        } else if (windowLayout.heightFraction > 0 && windowLayout.heightFraction < 1.0f) {

            height = (int) (defaultHeight * windowLayout.heightFraction);

        }



        inOutBounds.set(0, 0, width, height);

    }



    /**

     * Applies a vertical and horizontal gravity on the inOutBounds in relation to the stableBounds.

     */

    static void applyLayoutGravity(int verticalGravity, int horizontalGravity,

            @NonNull Rect inOutBounds, @NonNull Rect stableBounds) {

        final int width = inOutBounds.width();

        final int height = inOutBounds.height();



        final float fractionOfHorizontalOffset;

        switch (horizontalGravity) {

            case Gravity.LEFT:

                fractionOfHorizontalOffset = 0f;

                break;

            case Gravity.RIGHT:

                fractionOfHorizontalOffset = 1f;

                break;

            default:

                fractionOfHorizontalOffset = 0.5f;

        }



        final float fractionOfVerticalOffset;

        switch (verticalGravity) {

            case Gravity.TOP:

                fractionOfVerticalOffset = 0f;

                break;

            case Gravity.BOTTOM:

                fractionOfVerticalOffset = 1f;

                break;

            default:

                fractionOfVerticalOffset = 0.5f;

        }



        inOutBounds.offsetTo(stableBounds.left, stableBounds.top);

        final int xOffset = (int) (fractionOfHorizontalOffset * (stableBounds.width() - width));

        final int yOffset = (int) (fractionOfVerticalOffset * (stableBounds.height() - height));

        inOutBounds.offset(xOffset, yOffset);

    }

}

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

+2 −4
Original line number Diff line number Diff line
@@ -40,8 +40,6 @@ import static android.window.DisplayAreaOrganizer.FEATURE_UNDEFINED; 
import static com.android.server.wm.ActivityStarter.Request;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.TAG_ATM;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.TAG_WITH_CLASS_NAME;

import static com.android.server.wm.LaunchParamsModifierUtils.applyLayoutGravity;

import static com.android.server.wm.LaunchParamsModifierUtils.calculateLayoutBounds;



import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -644,13 +642,13 @@ class TaskLaunchParamsModifier implements LaunchParamsModifier { 
        displayArea.getStableRect(stableBounds);



        if (windowLayout.hasSpecifiedSize()) {

            calculateLayoutBounds(stableBounds, windowLayout, inOutBounds,

            LaunchParamsUtil.calculateLayoutBounds(stableBounds, windowLayout, inOutBounds,

                    /* desiredBounds */ null);

        } else if (inOutBounds.isEmpty()) {

            getTaskBounds(root, displayArea, windowLayout, WINDOWING_MODE_FREEFORM,

                    /* hasInitialBounds */ false, inOutBounds);

        }

        applyLayoutGravity(verticalGravity, horizontalGravity, inOutBounds,

        LaunchParamsUtil.applyLayoutGravity(verticalGravity, horizontalGravity, inOutBounds,

                stableBounds);

    }

services/tests/wmtests/src/com/android/server/wm/DesktopModeLaunchParamsModifierTests.java

+2 −1
Original line number Diff line number Diff line
@@ -57,7 +57,8 @@ import org.junit.runner.RunWith; 
@SmallTest

@Presubmit

@RunWith(WindowTestRunner.class)

public class DesktopModeLaunchParamsModifierTests extends LaunchParamsModifierTestsBase {

public class DesktopModeLaunchParamsModifierTests extends

        LaunchParamsModifierTestsBase<DesktopModeLaunchParamsModifier> {

    @Before

    public void setUp() throws Exception {

        mActivity = new ActivityBuilder(mAtm).build();