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

Commit 370c149d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "PIN Bouncer: Fix margins" into sc-dev am: 9441b74b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13418750

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I011bcd461c09931d058073c6bff03f6cbdf1d12a
parents a2e4f51d 9441b74b

packages/SystemUI/src/com/android/keyguard/NumPadKey.java

+7 −2
Original line number Diff line number Diff line
@@ -156,9 +156,14 @@ public class NumPadKey extends ViewGroup { 
    }



    @Override

    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {

        mAnimator.updateMargin((ViewGroup.MarginLayoutParams) getLayoutParams());

    public void setLayoutParams(ViewGroup.LayoutParams params) {

        mAnimator.updateMargin((ViewGroup.MarginLayoutParams) params);



        super.setLayoutParams(params);

    }



    @Override

    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {

        super.onMeasure(widthMeasureSpec, heightMeasureSpec);

        measureChildren(widthMeasureSpec, heightMeasureSpec);