From 424120b3007afc701812c02535aeab61cbf7b078 Mon Sep 17 00:00:00 2001
From: Aaron Liu <aaronjli@google.com>
Date: Mon, 22 Aug 2022 09:48:34 -0700
Subject: [PATCH] [Bouncer] Fix vertical spacing between buttons.

Fix vertical spacing between buttons in the bouncer. Because bouncer is
forced to be portrait for regular sized devices, we do not need these landscape dimens
anymore to handle that use case. This will fix the spacing for large
screen devices.

Bug: 242186543
Test: Manual on device
Change-Id: I1443ba67b993273169bd0085ccb38f7a1aa09d8c
---
 packages/SystemUI/res-keyguard/values-land/dimens.xml         | 1 -
 packages/SystemUI/res-keyguard/values-sw360dp-land/dimens.xml | 1 -
 packages/SystemUI/res-keyguard/values/dimens.xml              | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/SystemUI/res-keyguard/values-land/dimens.xml b/packages/SystemUI/res-keyguard/values-land/dimens.xml
index 4e92884f39f31..a4e7a5f12db41 100644
--- a/packages/SystemUI/res-keyguard/values-land/dimens.xml
+++ b/packages/SystemUI/res-keyguard/values-land/dimens.xml
@@ -22,7 +22,6 @@
     <dimen name="keyguard_eca_top_margin">0dp</dimen>
     <dimen name="keyguard_eca_bottom_margin">2dp</dimen>
     <dimen name="keyguard_password_height">26dp</dimen>
-    <dimen name="num_pad_entry_row_margin_bottom">0dp</dimen>
 
     <!-- The size of PIN text in the PIN unlock method. -->
     <integer name="scaled_password_text_size">26</integer>
diff --git a/packages/SystemUI/res-keyguard/values-sw360dp-land/dimens.xml b/packages/SystemUI/res-keyguard/values-sw360dp-land/dimens.xml
index f465be4f5228a..0421135b31a56 100644
--- a/packages/SystemUI/res-keyguard/values-sw360dp-land/dimens.xml
+++ b/packages/SystemUI/res-keyguard/values-sw360dp-land/dimens.xml
@@ -22,7 +22,6 @@
     <dimen name="keyguard_eca_top_margin">4dp</dimen>
     <dimen name="keyguard_eca_bottom_margin">4dp</dimen>
     <dimen name="keyguard_password_height">50dp</dimen>
-    <dimen name="num_pad_entry_row_margin_bottom">4dp</dimen>
 
     <!-- The size of PIN text in the PIN unlock method. -->
     <integer name="scaled_password_text_size">40</integer>
diff --git a/packages/SystemUI/res-keyguard/values/dimens.xml b/packages/SystemUI/res-keyguard/values/dimens.xml
index acf3e4dcf02a4..32871f0abb4f7 100644
--- a/packages/SystemUI/res-keyguard/values/dimens.xml
+++ b/packages/SystemUI/res-keyguard/values/dimens.xml
@@ -86,7 +86,7 @@
 
     <!-- Spacing around each button used for PIN view -->
     <dimen name="num_pad_key_width">72dp</dimen>
-    <dimen name="num_pad_entry_row_margin_bottom">16dp</dimen>
+    <dimen name="num_pad_entry_row_margin_bottom">12dp</dimen>
     <dimen name="num_pad_row_margin_bottom">6dp</dimen>
     <dimen name="num_pad_key_margin_end">12dp</dimen>