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

Commit 51d2d193 authored by Danesh M's avatar Danesh M Committed by Danesh M
Browse files

KeyguardSecurityViewFlipper : Fix sim unlock height overlap 

If the font size is set to Huge, and pin lockscreen + sim unlock screen
is showing, the text for the pinpad overlaps. Reason is we enforce the smallest
maxHeight on all children, and this breaks certain screens. Just let each child
use its own maxHeight that it set to begin with.

FEIJ-184

Change-Id: I3b461f6f75a3f541281fb32efc83a891ca7b65f0
parent 545dc467

packages/Keyguard/src/com/android/keyguard/KeyguardSecurityViewFlipper.java

+2 −15
Original line number Diff line number Diff line
@@ -202,25 +202,10 @@ public class KeyguardSecurityViewFlipper extends ViewFlipper implements Keyguard 


        final int widthSize = MeasureSpec.getSize(widthSpec);

        final int heightSize = MeasureSpec.getSize(heightSpec);

        int maxWidth = widthSize;

        int maxHeight = heightSize;

        final int count = getChildCount();

        for (int i = 0; i < count; i++) {

            final View child = getChildAt(i);

            final LayoutParams lp = (LayoutParams) child.getLayoutParams();



            if (lp.maxWidth > 0 && lp.maxWidth < maxWidth) {

                maxWidth = lp.maxWidth;

            }

            if (lp.maxHeight > 0 && lp.maxHeight < maxHeight) {

                maxHeight = lp.maxHeight;

            }

        }



        final int wPadding = getPaddingLeft() + getPaddingRight();

        final int hPadding = getPaddingTop() + getPaddingBottom();

        maxWidth = Math.max(0, maxWidth - wPadding);

        maxHeight = Math.max(0, maxHeight - hPadding);



        int width = widthMode == MeasureSpec.EXACTLY ? widthSize : 0;

        int height = heightMode == MeasureSpec.EXACTLY ? heightSize : 0;
@@ -228,6 +213,8 @@ public class KeyguardSecurityViewFlipper extends ViewFlipper implements Keyguard 
            final View child = getChildAt(i);

            final LayoutParams lp = (LayoutParams) child.getLayoutParams();



            int maxWidth = Math.max(0, lp.maxWidth - wPadding);

            int maxHeight = Math.max(0, lp.maxHeight - hPadding);

            final int childWidthSpec = makeChildMeasureSpec(maxWidth, lp.width);

            final int childHeightSpec = makeChildMeasureSpec(maxHeight, lp.height);