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

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

Change-Id: I359354f9edd28ed9e2d02fadf727048a1c6433a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-12-02 02:40:46 +00:00
committed by Automerger Merge Worker

View File

@@ -8918,9 +8918,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();
@@ -8943,6 +8941,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.
*/