From 82d46f2b02f50202dffd18ede9144d3601542693 Mon Sep 17 00:00:00 2001 From: Beverly Date: Fri, 2 Jul 2021 13:28:45 -0400 Subject: Update spacing for lock icon with udfps Limit text to two lines with ellipsis. Now correctly calculates spacing Test: manual Fixes: 192483581 Change-Id: Ie4f989b873c9aa2dcf09b02e77d16b7b9516580c --- packages/SystemUI/res/layout/keyguard_bottom_area.xml | 2 ++ .../SystemUI/src/com/android/keyguard/LockIconView.java | 2 +- .../src/com/android/keyguard/LockIconViewController.java | 14 ++++++++------ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/packages/SystemUI/res/layout/keyguard_bottom_area.xml b/packages/SystemUI/res/layout/keyguard_bottom_area.xml index e40138e1f49c..9ce83a789f59 100644 --- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml +++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml @@ -52,6 +52,8 @@ android:paddingStart="@dimen/keyguard_indication_text_padding" android:paddingEnd="@dimen/keyguard_indication_text_padding" android:textAppearance="@style/TextAppearance.Keyguard.BottomArea" + android:maxLines="2" + android:ellipsize="end" android:alpha=".8" android:accessibilityLiveRegion="polite" android:visibility="gone"/> diff --git a/packages/SystemUI/src/com/android/keyguard/LockIconView.java b/packages/SystemUI/src/com/android/keyguard/LockIconView.java index c425ddf7eeb1..c1d448db1e63 100644 --- a/packages/SystemUI/src/com/android/keyguard/LockIconView.java +++ b/packages/SystemUI/src/com/android/keyguard/LockIconView.java @@ -43,7 +43,7 @@ public class LockIconView extends ImageView implements Dumpable { mSensorRect = new RectF(); } - void setLocation(@NonNull PointF center, int radius) { + void setCenterLocation(@NonNull PointF center, int radius) { mLockIconCenter = center; mRadius = radius; diff --git a/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java b/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java index f3fbc50f560d..62cb4b9a33f5 100644 --- a/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java +++ b/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java @@ -98,7 +98,7 @@ public class LockIconViewController extends ViewController impleme private float mHeightPixels; private float mWidthPixels; private float mDensity; - private int mIndicationBottomPadding; + private int mKgBottomAreaHeight; private boolean mShowUnlockIcon; private boolean mShowLockIcon; @@ -280,7 +280,9 @@ public class LockIconViewController extends ViewController impleme mWidthPixels = metrics.widthPixels; mHeightPixels = metrics.heightPixels; mDensity = metrics.density; - mIndicationBottomPadding = mView.getContext().getResources().getDimensionPixelSize( + mKgBottomAreaHeight = mView.getContext().getResources().getDimensionPixelSize( + R.dimen.keyguard_indication_margin_bottom) + + mView.getContext().getResources().getDimensionPixelSize( R.dimen.keyguard_indication_bottom_padding); updateLockIconLocation(); } @@ -288,15 +290,15 @@ public class LockIconViewController extends ViewController impleme private void updateLockIconLocation() { if (mHasUdfps) { FingerprintSensorPropertiesInternal props = mAuthController.getUdfpsProps().get(0); - mView.setLocation(new PointF(props.sensorLocationX, props.sensorLocationY), + mView.setCenterLocation(new PointF(props.sensorLocationX, props.sensorLocationY), props.sensorRadius); } else { final float distAboveKgBottomArea = 12 * mDensity; final float radius = 36 * mDensity; - mView.setLocation( + mView.setCenterLocation( new PointF(mWidthPixels / 2, - mHeightPixels - mIndicationBottomPadding - distAboveKgBottomArea - radius), - (int) radius); + mHeightPixels - mKgBottomAreaHeight - distAboveKgBottomArea + - radius / 2), (int) radius); } mView.getHitRect(mSensorTouchLocation); -- cgit v1.2.3-59-g8ed1b