From c0f627d790bf926ad6355907ae6256b2af309f4e Mon Sep 17 00:00:00 2001
From: Beverly <beverlyt@google.com>
Date: Wed, 25 Jan 2023 18:43:15 +0000
Subject: [PATCH] Don't use dp for lock icon padding

We don't want it to scale with density
changes. It scales in the wrong direction.

This was also causing a difference in lock icon size for foldable
devices where the inner display is using a different lock icon padding
than the outer display.

Test: visual manual inspection
Fixes: 259677170
Fixes: 264738021
Change-Id: I4075fd5e3f0aec7472edc56a0f8c95be5e68d65a
---
 packages/SystemUI/res-keyguard/values-sw600dp/dimens.xml       | 3 ---
 .../src/com/android/keyguard/LockIconViewController.java       | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/SystemUI/res-keyguard/values-sw600dp/dimens.xml b/packages/SystemUI/res-keyguard/values-sw600dp/dimens.xml
index a1068c65bae24..6c8db91d49bbc 100644
--- a/packages/SystemUI/res-keyguard/values-sw600dp/dimens.xml
+++ b/packages/SystemUI/res-keyguard/values-sw600dp/dimens.xml
@@ -25,9 +25,6 @@
     <!-- Margin around the various security views -->
     <dimen name="keyguard_security_view_top_margin">12dp</dimen>
 
-    <!-- Padding for the lock icon on the keyguard -->
-    <dimen name="lock_icon_padding">16dp</dimen>
-
     <!-- Overload default clock widget parameters -->
     <dimen name="widget_big_font_size">100dp</dimen>
     <dimen name="widget_label_font_size">18sp</dimen>
diff --git a/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java b/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
index 1322f16a5a59e..8071a5de1ce93 100644
--- a/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
+++ b/packages/SystemUI/src/com/android/keyguard/LockIconViewController.java
@@ -429,6 +429,7 @@ public class LockIconViewController extends ViewController<LockIconView> impleme
         pw.println(" mStatusBarState: " + StatusBarState.toString(mStatusBarState));
         pw.println(" mInterpolatedDarkAmount: " + mInterpolatedDarkAmount);
         pw.println(" mSensorTouchLocation: " + mSensorTouchLocation);
+        pw.println(" mDefaultPaddingPx: " + mDefaultPaddingPx);
 
         if (mView != null) {
             mView.dump(pw, args);