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

Commit 73774c26 authored by Louis Chang's avatar Louis Chang
Browse files

Restrict the smallest screen width dp of an embedded TF 

Or the smallest screen width dp could be the same as the
display size.

Bug: 230035382
Test: verify sw config of an embedded activity
Change-Id: Ic085c6ed134c2787a26fd2b02b4345b04fb693e6
Merged-In: Ic085c6ed134c2787a26fd2b02b4345b04fb693e6
(cherry picked from commit 9cee26e2)
parent 04f59c26

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

+7 −1
Original line number Diff line number Diff line
@@ -2062,9 +2062,15 @@ class TaskFragment extends WindowContainer<WindowContainer> { 
                final boolean inPipTransition = windowingMode == WINDOWING_MODE_PINNED

                        && !mTmpFullBounds.isEmpty() && mTmpFullBounds.equals(parentBounds);

                if (WindowConfiguration.isFloating(windowingMode) && !inPipTransition) {

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

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

                    // task, because they should not be affected by insets.

                    inOutConfig.smallestScreenWidthDp = (int) (

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

                } else if (isEmbedded()) {

                    // For embedded TFs, the smallest width should be updated. Otherwise, inherit

                    // from the parent task would result in applications loaded wrong resource.

                    inOutConfig.smallestScreenWidthDp =

                            Math.min(inOutConfig.screenWidthDp, inOutConfig.screenHeightDp);

                }

                // otherwise, it will just inherit

            }