From 13dee43e6f793a5e2a71f82c2c48586e5bb09afa Mon Sep 17 00:00:00 2001
From: Adrian Roos <roosa@google.com>
Date: Tue, 10 Jun 2014 19:42:47 +0200
Subject: [PATCH] Fix broken tablet layout of QS on lockscreen

Bug: 15536406
Change-Id: I6c075d0875cf78dff1938b5cfd49e6b1924bcc99
---
 .../android/systemui/statusbar/phone/StatusBarHeaderView.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java
index 13d3291e43e50..471e8d38adf8b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java
@@ -138,6 +138,7 @@ public class StatusBarHeaderView extends RelativeLayout implements View.OnClickL
             updateBrightnessControllerState();
             updateZTranslation();
             updateClickTargets();
+            updateWidth();
             if (mQSPanel != null) {
                 mQSPanel.setExpanded(expanded && !overscrolled);
             }
@@ -173,7 +174,7 @@ public class StatusBarHeaderView extends RelativeLayout implements View.OnClickL
     }
 
     private void updateWidth() {
-        int width = mKeyguardShowing ? mKeyguardWidth : mNormalWidth;
+        int width = (mKeyguardShowing && !mExpanded) ? mKeyguardWidth : mNormalWidth;
         ViewGroup.LayoutParams lp = getLayoutParams();
         if (width != lp.width) {
             lp.width = width;