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

Commit de93c539 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Dev option] Correction to incorrect flag reference in ag/28429166" into main

parents 47e73cff 2e2d7b15

libs/WindowManager/Shell/src/com/android/wm/shell/compatui/CompatUIWindowManager.java

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ class CompatUIWindowManager extends CompatUIWindowManagerAbstract { 
        mCallback = callback;

        mHasSizeCompat = taskInfo.appCompatTaskInfo.topActivityInSizeCompat;

        if (DESKTOP_WINDOWING_MODE.isEnabled(mContext)

                && DesktopModeFlags.THEMED_APP_HEADERS.isEnabled(context)) {

                && DesktopModeFlags.DYNAMIC_INITIAL_BOUNDS.isEnabled(context)) {

            // Don't show the SCM button for freeform tasks

            mHasSizeCompat &= !taskInfo.isFreeform();

        }

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

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import static com.android.server.wm.AppCompatUtils.computeAspectRatio; 
import static com.android.server.wm.LaunchParamsUtil.applyLayoutGravity;

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





import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.ActivityOptions;