Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update spacing for lock icon with udfps" into sc-dev

Browse Source
This commit is contained in:
Beverly Tai
2021-07-07 13:22:33 +00:00
committed by Android (Google) Code Review
parent 34d05933cc 82d46f2b02
commit 315a26781c
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/layout/keyguard_bottom_area.xml
View File

@@ -52,6 +52,8 @@
android:paddingStart="@dimen/keyguard_indication_text_padding" android:paddingStart="@dimen/keyguard_indication_text_padding"
android:paddingEnd="@dimen/keyguard_indication_text_padding" android:paddingEnd="@dimen/keyguard_indication_text_padding"
android:textAppearance="@style/TextAppearance.Keyguard.BottomArea" android:textAppearance="@style/TextAppearance.Keyguard.BottomArea"
android:maxLines="2"
android:ellipsize="end"
android:alpha=".8" android:alpha=".8"
android:accessibilityLiveRegion="polite" android:accessibilityLiveRegion="polite"
android:visibility="gone"/> android:visibility="gone"/>

2
packages/SystemUI/src/com/android/keyguard/LockIconView.java
View File

@@ -43,7 +43,7 @@ public class LockIconView extends ImageView implements Dumpable {
mSensorRect = new RectF(); mSensorRect = new RectF();
} }
void setLocation(@NonNull PointF center, int radius) { void setCenterLocation(@NonNull PointF center, int radius) {
mLockIconCenter = center; mLockIconCenter = center;
mRadius = radius; mRadius = radius;

14
packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
View File

@@ -98,7 +98,7 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
private float mHeightPixels; private float mHeightPixels;
private float mWidthPixels; private float mWidthPixels;
private float mDensity; private float mDensity;
private int mIndicationBottomPadding; private int mKgBottomAreaHeight;
private boolean mShowUnlockIcon; private boolean mShowUnlockIcon;
private boolean mShowLockIcon; private boolean mShowLockIcon;
@@ -280,7 +280,9 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
mWidthPixels = metrics.widthPixels; mWidthPixels = metrics.widthPixels;
mHeightPixels = metrics.heightPixels; mHeightPixels = metrics.heightPixels;
mDensity = metrics.density; 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); R.dimen.keyguard_indication_bottom_padding);
updateLockIconLocation(); updateLockIconLocation();
} }
@@ -288,15 +290,15 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
private void updateLockIconLocation() { private void updateLockIconLocation() {
if (mHasUdfps) { if (mHasUdfps) {
FingerprintSensorPropertiesInternal props = mAuthController.getUdfpsProps().get(0); FingerprintSensorPropertiesInternal props = mAuthController.getUdfpsProps().get(0);
mView.setLocation(new PointF(props.sensorLocationX, props.sensorLocationY), mView.setCenterLocation(new PointF(props.sensorLocationX, props.sensorLocationY),
props.sensorRadius); props.sensorRadius);
} else { } else {
final float distAboveKgBottomArea = 12 * mDensity; final float distAboveKgBottomArea = 12 * mDensity;
final float radius = 36 * mDensity; final float radius = 36 * mDensity;
mView.setLocation( mView.setCenterLocation(
new PointF(mWidthPixels / 2, new PointF(mWidthPixels / 2,
mHeightPixels - mIndicationBottomPadding - distAboveKgBottomArea - radius), mHeightPixels - mKgBottomAreaHeight - distAboveKgBottomArea
(int) radius); - radius / 2), (int) radius);
} }
mView.getHitRect(mSensorTouchLocation); mView.getHitRect(mSensorTouchLocation);