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

Commit 9e552b45 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by android-build-merger
Browse files

Fix wrong measurement in DecorView am: ffd04902 

am: c907ce46

* commit 'c907ce46':
  Fix wrong measurement in DecorView
parents 756984be c907ce46

core/java/com/android/internal/policy/DecorView.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -585,14 +585,14 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind 
                    w = 0;

                    w = 0;

                }

                }

                if (DEBUG_MEASURE) Log.d(mLogTag, "Fixed width: " + w);

                if (DEBUG_MEASURE) Log.d(mLogTag, "Fixed width: " + w);

                if (w > 0) {

                final int widthSize = MeasureSpec.getSize(widthMeasureSpec);

                final int widthSize = MeasureSpec.getSize(widthMeasureSpec);

                if (w > 0) {

                    widthMeasureSpec = MeasureSpec.makeMeasureSpec(

                    widthMeasureSpec = MeasureSpec.makeMeasureSpec(

                            Math.min(w, widthSize), EXACTLY);

                            Math.min(w, widthSize), EXACTLY);

                    fixedWidth = true;

                    fixedWidth = true;

                } else {

                } else {

                    widthMeasureSpec = MeasureSpec.makeMeasureSpec(

                    widthMeasureSpec = MeasureSpec.makeMeasureSpec(

                            widthMeasureSpec - mFloatingInsets.left - mFloatingInsets.right,

                            widthSize - mFloatingInsets.left - mFloatingInsets.right,

                            AT_MOST);

                            AT_MOST);

                    mApplyFloatingHorizontalInsets = true;

                    mApplyFloatingHorizontalInsets = true;

                }

                }