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

Commit 223826b3 authored by Xiyuan Xia's avatar Xiyuan Xia Committed by Android Git Automerger
Browse files

am e103029d: Merge "Avoid keyguard UI layout dimensions underflow" into mnc-dev 

* commit 'e103029d':
  Avoid keyguard UI layout dimensions underflow
parents 7ec9264f e103029d

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

+2 −2
Original line number Diff line number Diff line
@@ -203,8 +203,8 @@ public class KeyguardSecurityViewFlipper extends ViewFlipper implements Keyguard 


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

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

        maxWidth -= wPadding;

        maxHeight -= hPadding;

        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;