14
+++ b/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
@@ -384,6 +384,10 @@ public class LockIconViewController extends ViewController<LockIconView> implememWidthPixels = bounds.right;mHeightPixels = bounds.bottom;mBottomPaddingPx = getResources().getDimensionPixelSize(R.dimen.lock_icon_margin_bottom);
+ if(mBottomPaddingPx > 80){
+ mBottomPaddingPx = 80;
+
+ }mDefaultPaddingPx =getResources().getDimensionPixelSize(R.dimen.lock_icon_padding);@@ -396,7 +400,8 @@ public class LockIconViewController extends ViewController<LockIconView> implemeprivate void updateLockIconLocation() {final float scaleFactor = mAuthController.getScaleFactor();
- final int scaledPadding = (int) (mDefaultPaddingPx * scaleFactor);
+//final int scaledPadding = (int) (mDefaultPaddingPx * scaleFactor);
+ final int scaledPadding = 21;if (mUdfpsSupported) {mView.setCenterLocation(mAuthController.getUdfpsLocation(),mAuthController.getUdfpsRadius(), scaledPadding);
15
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/DeviceEntryIconViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/DeviceEntryIconViewBinder.kt
index b45eae7301b4..393856abd3c4 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/DeviceEntryIconViewBinder.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/DeviceEntryIconViewBinder.kt
@@ -144,8 +144,8 @@ object DeviceEntryIconViewBinder {}launch("$TAG#viewModel.burnInOffsets") {viewModel.burnInOffsets.collect { burnInOffsets ->
- view.translationX = burnInOffsets.x.toFloat()
- view.translationY = burnInOffsets.y.toFloat()
+ view.translationX = burnInOffsets.x.toFloat()*4
+ view.translationY = burnInOffsets.y.toFloat()*4view.aodFpDrawable.progress = burnInOffsets.progress}}
@@ -175,10 +175,10 @@ object DeviceEntryIconViewBinder {fgIconView.imageTintList =ColorStateList.valueOf(overrideColor?.toArgb() ?: viewModel.tint)fgIconView.setPadding(
- viewModel.padding,
- viewModel.padding,
- viewModel.padding,
- viewModel.padding,
+ 0,
+ 0,
+ 0,
+ 0,)}}
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/DeviceEntryIconView.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/DeviceEntryIconView.kt
index 1c6323594c70..2d5058e8bccd 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/DeviceEntryIconView.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/DeviceEntryIconView.kt
@@ -222,6 +222,7 @@ constructor(}private fun addLongpressHandlingView() {
+ android.util.Log.d("liujunjie22","=========== addLongpressHandlingView==============");addView(longPressHandlingView)val lp = longPressHandlingView.layoutParams as LayoutParamslp.height = ViewGroup.LayoutParams.MATCH_PARENT
@@ -230,22 +231,25 @@ constructor(}private fun addIconImageView() {
+ android.util.Log.d("liujunjie22","=========== addIconImageView==============");iconView.scaleType = ImageView.ScaleType.CENTER_CROPiconView.setImageDrawable(animatedIconDrawable)addView(iconView)val lp = iconView.layoutParams as LayoutParams
- lp.height = ViewGroup.LayoutParams.MATCH_PARENT
- lp.width = ViewGroup.LayoutParams.MATCH_PARENT
+ //lp.height = ViewGroup.LayoutParams.MATCH_PARENT
+ lp.height = 50;
+ lp.width = 50;lp.gravity = Gravity.CENTERiconView.layoutParams = lp}private fun addBgImageView() {
+ android.util.Log.d("liujunjie22","=========== addBgImageView==============");bgView.setImageDrawable(context.getDrawable(R.drawable.fingerprint_bg))addView(bgView)val lp = bgView.layoutParams as LayoutParams
- lp.height = ViewGroup.LayoutParams.MATCH_PARENT
- lp.width = ViewGroup.LayoutParams.MATCH_PARENT
+ lp.height = 50;
+ lp.width = 50;bgView.layoutParams = lp}