From 4999764bfba6a7b61d82812023b3e2fe24324d73 Mon Sep 17 00:00:00 2001
From: Fabian Kozynski <kozynski@google.com>
Date: Thu, 16 May 2019 15:41:45 -0400
Subject: Fixes QSCustomizer header height

So that the tiles in QSCustomizer align with the real tiles in portrait.
Fixed the comment specifying how to calculate the proper height based on
the views in QSPanel and QSCustomizer.

Test: visual. It matches.
Test: change display and font size. It still matches.
Fixes: 132813963
Change-Id: I93a3531ab8e6170fb2665552ce3d909533337301
---
 packages/SystemUI/res/layout/qs_customize_header.xml | 1 -
 packages/SystemUI/res/values/dimens.xml              | 7 +++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/SystemUI/res/layout/qs_customize_header.xml b/packages/SystemUI/res/layout/qs_customize_header.xml
index 58066a3ef19c..481561d74138 100644
--- a/packages/SystemUI/res/layout/qs_customize_header.xml
+++ b/packages/SystemUI/res/layout/qs_customize_header.xml
@@ -20,7 +20,6 @@
     android:id="@android:id/title"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="@dimen/qs_tile_margin_top_bottom_negative"
     android:gravity="center"
     android:minHeight="@dimen/qs_customize_header_min_height"
     android:textAppearance="@style/TextAppearance.QSEdit.Headers"
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index fbb439af7c51..8ba2cda36c8d 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -439,8 +439,11 @@
     <dimen name="qs_tile_margin_vertical">24dp</dimen>
     <dimen name="qs_tile_margin_top_bottom">12dp</dimen>
     <dimen name="qs_tile_margin_top_bottom_negative">-12dp</dimen>
-    <!-- The height of the qs customize header. Should be (28dp - qs_tile_margin_top_bottom). -->
-    <dimen name="qs_customize_header_min_height">40dp</dimen>
+    <!-- The height of the qs customize header. Should be
+         (qs_panel_padding_top (48dp) +  brightness_mirror_height (48dp) + qs_tile_margin_top (18dp)) -
+         (Toolbar_minWidth (56dp) + qs_tile_margin_top_bottom (12dp))
+    -->
+    <dimen name="qs_customize_header_min_height">46dp</dimen>
     <dimen name="qs_tile_margin_top">18dp</dimen>
     <dimen name="qs_tile_background_size">44dp</dimen>
     <dimen name="qs_quick_tile_size">48dp</dimen>
-- 
cgit v1.2.3-59-g8ed1b