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

Commit 2983e92f authored by Graciela Wissen Putri's avatar Graciela Wissen Putri
Browse files

Set appBounds always in desktop mode launch 

Now DesktopModeLaunchParamsModifier only calculates bounds if we know
tasks are definitely launching in desktop mode, so it is safe to always
set app bounds if caption insets should be excluded for unresizeable
apps.

Flag: com.android.window.flags.exclude_caption_from_app_bounds
Test: atest DesktopModeLaunchParamsModifierTests
Fix: 438437258
Change-Id: I3bb6b7633a6715c1d9721cfb413af37b4b5e8d9d
parent 74322386

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

+2 −2
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ import static android.content.pm.ActivityInfo.isFixedOrientationPortrait; 
import static android.content.res.Configuration.ORIENTATION_LANDSCAPE;

import static android.content.res.Configuration.ORIENTATION_PORTRAIT;



import static com.android.internal.policy.SystemBarUtils.getDesktopViewAppHeaderHeightPx;

import static com.android.internal.policy.DesktopModeCompatUtils.shouldExcludeCaptionFromAppBounds;

import static com.android.internal.policy.SystemBarUtils.getDesktopViewAppHeaderHeightPx;

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

import static com.android.server.wm.LaunchParamsUtil.calculateLayoutBounds;
@@ -125,7 +125,7 @@ public final class DesktopModeBoundsCalculator { 
            logger.accept("respecting option bounds cascaded position="

                    + shouldRespectOptionPosition);

        }

        if (updateOptionBoundsSize && captionHeight != 0) {

        if (captionHeight != 0) {

            outParams.mAppBounds.set(outParams.mBounds);

            outParams.mAppBounds.top += captionHeight;

            logger.accept("exclude-caption-height-from-app-bounds");

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

+4 −0
Original line number Diff line number Diff line
@@ -1291,6 +1291,7 @@ public class DesktopModeLaunchParamsModifierTests extends 
                .setActivity(activity).calculate());

        assertEquals(desiredWidth, mResult.mBounds.width());

        assertEquals(desiredHeight, mResult.mBounds.height());

        assertEquals(desiredHeight - captionHeight, mResult.mAppBounds.height());

    }



    @Test
@@ -1318,6 +1319,7 @@ public class DesktopModeLaunchParamsModifierTests extends 
                .setActivity(activity).calculate());

        assertEquals(desiredWidth, mResult.mBounds.width());

        assertEquals(desiredHeight, mResult.mBounds.height());

        assertEquals(desiredHeight - captionHeight, mResult.mAppBounds.height());

    }



    @Test
@@ -1473,6 +1475,7 @@ public class DesktopModeLaunchParamsModifierTests extends 
                .setActivity(activity).calculate());

        assertEquals(desiredWidth, mResult.mBounds.width());

        assertEquals(desiredHeight, mResult.mBounds.height());

        assertEquals(desiredHeight - captionHeight, mResult.mAppBounds.height());

    }



    @Test
@@ -1500,6 +1503,7 @@ public class DesktopModeLaunchParamsModifierTests extends 
                .setActivity(activity).calculate());

        assertEquals(desiredWidth, mResult.mBounds.width());

        assertEquals(desiredHeight, mResult.mBounds.height());

        assertEquals(desiredHeight - captionHeight, mResult.mAppBounds.height());

    }



    @Test