From d2956e7ffb1a2b34b15fb68edb3a64590d7f0ef5 Mon Sep 17 00:00:00 2001 From: Beverly Date: Wed, 11 May 2022 16:28:48 +0000 Subject: [PATCH] Update scaled padding for all devices Note: currently only devices with UDFPS supports resolution change, but if this changes in the future then the scaleFactor needs to move outside of UDFPS and into a common controller in SysUi. Test: manual Fixes: 232250669 Change-Id: I6c2ef662909fc02492371dda5c8deaa76b712414 --- .../android/keyguard/LockIconViewController.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java b/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java index d79b1454514e9..ab831be0f8e0a 100644 --- a/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java +++ b/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java @@ -123,7 +123,7 @@ public class LockIconViewController extends ViewController impleme private float mHeightPixels; private float mWidthPixels; private int mBottomPaddingPx; - private int mScaledPaddingPx; + private int mDefaultPaddingPx; private boolean mShowUnlockIcon; private boolean mShowLockIcon; @@ -340,6 +340,8 @@ public class LockIconViewController extends ViewController impleme mWidthPixels = bounds.right; mHeightPixels = bounds.bottom; mBottomPaddingPx = getResources().getDimensionPixelSize(R.dimen.lock_icon_margin_bottom); + mDefaultPaddingPx = + getResources().getDimensionPixelSize(R.dimen.lock_icon_padding); mUnlockedLabel = mView.getContext().getResources().getString( R.string.accessibility_unlock_button); @@ -348,17 +350,16 @@ public class LockIconViewController extends ViewController impleme } private void updateLockIconLocation() { + final float scaleFactor = mAuthController.getScaleFactor(); + final int scaledPadding = (int) (mDefaultPaddingPx * scaleFactor); if (mUdfpsSupported) { - final int defaultPaddingPx = - getResources().getDimensionPixelSize(R.dimen.lock_icon_padding); - mScaledPaddingPx = (int) (defaultPaddingPx * mAuthController.getScaleFactor()); mView.setCenterLocation(mAuthController.getUdfpsLocation(), - mAuthController.getUdfpsRadius(), mScaledPaddingPx); + mAuthController.getUdfpsRadius(), scaledPadding); } else { mView.setCenterLocation( new PointF(mWidthPixels / 2, - mHeightPixels - mBottomPaddingPx - sLockIconRadiusPx), - sLockIconRadiusPx, mScaledPaddingPx); + mHeightPixels - ((mBottomPaddingPx + sLockIconRadiusPx) * scaleFactor)), + sLockIconRadiusPx * scaleFactor, scaledPadding); } }