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

Commit b9935889 authored by Diego Perez's avatar Diego Perez
Browse files

resolved conflicts for merge of 112d8a36 to mnc-dev

Change-Id: Ic9511a57db8a96f54dba0704800789a8602b9dd2
parents b2eed1d6 112d8a36
Loading
Loading
Loading
Loading
+10 −0
Original line number Diff line number Diff line
@@ -526,6 +526,11 @@ public class RenderSessionImpl extends RenderAction<SessionParams> {
                        if (neededWidth > measuredWidth) {
                            mMeasuredScreenWidth += neededWidth - measuredWidth;
                        }
                        if (mMeasuredScreenWidth < measuredWidth) {
                            // If the screen width is less than the exact measured width,
                            // expand to match.
                            mMeasuredScreenWidth = measuredWidth;
                        }
                    }

                    if (renderingMode.isVertExpand()) {
@@ -534,6 +539,11 @@ public class RenderSessionImpl extends RenderAction<SessionParams> {
                        if (neededHeight > measuredHeight) {
                            mMeasuredScreenHeight += neededHeight - measuredHeight;
                        }
                        if (mMeasuredScreenHeight < measuredHeight) {
                            // If the screen height is less than the exact measured height,
                            // expand to match.
                            mMeasuredScreenHeight = measuredHeight;
                        }
                    }
                }
            }
+121 B (675 B)

File changed.

No diff preview for this file type.

(1.02 KiB)

File changed.

No diff preview for this file type.

+636 B
Loading image diff...
+578 B
Loading image diff...
Loading