From cf845036e5cbca2345bdb548c4a3e1729b699269 Mon Sep 17 00:00:00 2001
From: Evan Laird <evanlaird@google.com>
Date: Tue, 17 Jul 2018 15:55:40 -0400
Subject: [PATCH] DO NOT MERGE: Use quick_qs_total_height when QS is not
 disabled

A change in the logic of QuickStatusBarHeader#updateResources
mistakenly used quick_qs_offset_height for the total height of the qqs
panel instead of quick_qs_total_height. This caused the quick-quick
settings panel to be too short on devices which don't have a large
notch.

Test: visual, on device without a notch
Change-Id: I0deed2560328501e547b04239133e350cdac4ff6
Fixes: 111554577
---
 .../src/com/android/systemui/qs/QuickStatusBarHeader.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
index 36d8326472074..07e2a20438e05 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
@@ -303,7 +303,7 @@ public class QuickStatusBarHeader extends RelativeLayout implements
         } else {
             lp.height = Math.max(getMinimumHeight(),
                     resources.getDimensionPixelSize(
-                            com.android.internal.R.dimen.quick_qs_offset_height));
+                            com.android.internal.R.dimen.quick_qs_total_height));
         }
 
         setLayoutParams(lp);