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

Commit c32d5abe authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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: a11380d3
  Fix bug where mw landscape cell size is calculated incorretly.
parents 7379dbe0 ff539ca6

src/com/android/launcher3/DeviceProfile.java

+4 −0
Original line number Diff line number Diff line
@@ -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.