Merge changes from topic "am-b4842062-1b80-4730-9ee4-8ba12a75cc30" into ub-launcher3-master

* changes:
  [automerger] Fix bug where mw landscape cell size is calculated incorretly. am: a11380d370
  Fix bug where mw landscape cell size is calculated incorretly.
This commit is contained in:
TreeHugger Robot
2017-08-30 19:17:07 +00:00
committed by Android (Google) Code Review

View File

@@ -267,6 +267,10 @@ public class DeviceProfile {
}
DeviceProfile getMultiWindowProfile(Context context, Point mwSize) {
// We take the minimum sizes of this profile and it's multi-window variant to ensure that
// the system decor is always excluded.
mwSize.set(Math.min(availableWidthPx, mwSize.x), Math.min(availableHeightPx, mwSize.y));
// In multi-window mode, we can have widthPx = availableWidthPx
// and heightPx = availableHeightPx because Launcher uses the InvariantDeviceProfiles'
// widthPx and heightPx values where it's needed.