Merge "Shows "App isn't installed" while tapping on Home on Tablet" into tm-qpr-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
cc63282bc4
@@ -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.
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user