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

Commit c3dbed3a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Shows "App isn't installed" while tapping on Home on Tablet" into tm-qpr-dev am: cc63282b 

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



Change-Id: I52d4e94f57b5e9b52e2d4faab83e1bb6484dc25a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 41b16dcf cc63282b

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

+8 −3
Original line number Diff line number Diff line
@@ -8920,9 +8920,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        }



        if (info.isChangeEnabled(OVERRIDE_MIN_ASPECT_RATIO_EXCLUDE_PORTRAIT_FULLSCREEN)

                && getParent().getConfiguration().orientation == ORIENTATION_PORTRAIT

                && getParent().getWindowConfiguration().getWindowingMode()

                        == WINDOWING_MODE_FULLSCREEN) {

                && isParentFullscreenPortrait()) {

            // We are using the parent configuration here as this is the most recent one that gets

            // passed to onConfigurationChanged when a relevant change takes place

            return info.getMinAspectRatio();
@@ -8945,6 +8943,13 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        return info.getMinAspectRatio();

    }



    private boolean isParentFullscreenPortrait() {

        final WindowContainer parent = getParent();

        return parent != null

                && parent.getConfiguration().orientation == ORIENTATION_PORTRAIT

                && parent.getWindowConfiguration().getWindowingMode() == WINDOWING_MODE_FULLSCREEN;

    }



    /**

     * Returns true if the activity has maximum or minimum aspect ratio.

     */