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

Commit 57bf65cf authored by Diego Vela's avatar Diego Vela Committed by Automerger Merge Worker
Browse files

Merge "Report folding features to letterboxed apps." into udc-dev am: ca1c9e40 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23048830



Change-Id: Ic87e5d61c2ceb3b10a172e08f9909ec509ea5f84
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4a0c0157 ca1c9e40

libs/WindowManager/Jetpack/src/androidx/window/extensions/layout/WindowLayoutComponentImpl.java

+1 −10
Original line number Diff line number Diff line
@@ -371,24 +371,15 @@ public class WindowLayoutComponentImpl implements WindowLayoutComponent { 
            final Rect taskBounds = taskConfig.windowConfiguration.getBounds();

            final WindowManager windowManager = Objects.requireNonNull(

                    context.getSystemService(WindowManager.class));

            final Rect currentBounds = windowManager.getCurrentWindowMetrics().getBounds();

            final Rect maxBounds = windowManager.getMaximumWindowMetrics().getBounds();

            boolean isTaskExpanded = maxBounds.equals(taskBounds);

            boolean isActivityExpanded = maxBounds.equals(currentBounds);

            /*

             * We need to proxy being in full screen because when a user enters PiP and exits PiP

             * the task windowingMode will report multi-window/pinned until the transition is

             * finished in WM Shell.

             * maxBounds == taskWindowBounds is a proxy check to verify the window is full screen

             * For tasks that are letterboxed, we use currentBounds == maxBounds to filter these

             * out.

             */

            // TODO(b/262900133) remove currentBounds check when letterboxed apps report bounds.

            // currently we don't want to report to letterboxed apps since they do not update the

            // window bounds when the Activity is moved.  An inaccurate fold will be reported so

            // we skip.

            return isTaskExpanded && (isActivityExpanded

                    || mTaskFragmentOrganizer.isActivityEmbedded(activityToken));

            return isTaskExpanded;

        } else {

            // TODO(b/242674941): use task windowing mode for window context that associates with

            //  activity.