From 587ddafcc5f0cfd15fa370fdea7b08e3ab649b26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Go=CC=88llner?= <chrisgollner@google.com>
Date: Mon, 16 Jan 2023 10:34:42 +0100
Subject: [PATCH] Match keyguard and regular status bar height on large screens

According to specs it seems that these should match. Changed the custom
keyguard heights to follow the regular status bar height.

Fixes: 263351148
Test: Manually on device
Change-Id: I72a2df4e1594f327c860276630d0cf59a0f255d1
---
 packages/SystemUI/res/values-sw600dp-land/dimens.xml | 2 --
 packages/SystemUI/res/values-sw600dp/dimens.xml      | 5 +++--
 packages/SystemUI/res/values-sw720dp-land/dimens.xml | 2 --
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/SystemUI/res/values-sw600dp-land/dimens.xml b/packages/SystemUI/res/values-sw600dp-land/dimens.xml
index 6c7cab51f440c..6b23c092fd2f9 100644
--- a/packages/SystemUI/res/values-sw600dp-land/dimens.xml
+++ b/packages/SystemUI/res/values-sw600dp-land/dimens.xml
@@ -44,8 +44,6 @@
     <item name="controls_task_view_width_percentage" translatable="false" format="float" type="dimen">0.45</item>
     <dimen name="controls_task_view_right_margin">8dp</dimen>
 
-    <dimen name="status_bar_header_height_keyguard">42dp</dimen>
-
     <dimen name="lockscreen_shade_max_over_scroll_amount">32dp</dimen>
 
     <dimen name="status_view_margin_horizontal">8dp</dimen>
diff --git a/packages/SystemUI/res/values-sw600dp/dimens.xml b/packages/SystemUI/res/values-sw600dp/dimens.xml
index 599bf30a5135c..4432ef70e6fa6 100644
--- a/packages/SystemUI/res/values-sw600dp/dimens.xml
+++ b/packages/SystemUI/res/values-sw600dp/dimens.xml
@@ -16,8 +16,9 @@
 */
 -->
 <resources>
-    <!-- Height of the status bar header bar when on Keyguard -->
-    <dimen name="status_bar_header_height_keyguard">60dp</dimen>
+    <!-- Height of the status bar header bar when on Keyguard.
+         On large screens should be the same as the regular status bar. -->
+    <dimen name="status_bar_header_height_keyguard">@dimen/status_bar_height</dimen>
 
     <!-- Size of user icon + frame in the qs user picker (incl. frame) -->
     <dimen name="qs_framed_avatar_size">60dp</dimen>
diff --git a/packages/SystemUI/res/values-sw720dp-land/dimens.xml b/packages/SystemUI/res/values-sw720dp-land/dimens.xml
index 3fc59e38ec6c5..1c9b3a8d81e91 100644
--- a/packages/SystemUI/res/values-sw720dp-land/dimens.xml
+++ b/packages/SystemUI/res/values-sw720dp-land/dimens.xml
@@ -23,8 +23,6 @@
 
     <dimen name="keyguard_split_shade_top_margin">72dp</dimen>
 
-    <dimen name="status_bar_header_height_keyguard">56dp</dimen>
-
     <dimen name="status_view_margin_horizontal">24dp</dimen>
 
     <dimen name="qs_media_session_height_expanded">251dp</dimen>