From a59215aa4dcaa115b77a16c1f80a8099f58108a7 Mon Sep 17 00:00:00 2001
From: Amin Shaikh <ashaikh@google.com>
Date: Mon, 23 Apr 2018 08:52:38 -0400
Subject: [PATCH] Make settings icon invisible when QS is collapsed.

Also fix calling super#onAttachedToWindow in QuickStatusBarHeader.

Change-Id: I2eb8c31b2d3a9ca20ac76608650a0e42ec25e504
Fixes: 78203022
Test: visual
---
 packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java  | 1 +
 .../src/com/android/systemui/qs/QuickStatusBarHeader.java        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java b/packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java
index fd9ddb0fd0acd..b7907a605ca5f 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java
@@ -284,6 +284,7 @@ public class QSFooterImpl extends FrameLayout implements QSFooter,
         final boolean isDemo = UserManager.isDeviceInDemoMode(mContext);
         mMultiUserSwitch.setVisibility(showUserSwitcher(isDemo) ? View.VISIBLE : View.INVISIBLE);
         mEdit.setVisibility(isDemo || !mExpanded ? View.INVISIBLE : View.VISIBLE);
+        mSettingsButton.setVisibility(isDemo || !mExpanded ? View.INVISIBLE : View.VISIBLE);
     }
 
     private boolean showUserSwitcher(boolean isDemo) {
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
index 5d7dcbbf08d1e..2dcb72362b0a3 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
@@ -366,6 +366,7 @@ public class QuickStatusBarHeader extends RelativeLayout implements
 
     @Override
     public void onAttachedToWindow() {
+        super.onAttachedToWindow();
         Dependency.get(StatusBarIconController.class).addIconGroup(mIconManager);
         requestApplyInsets();
     }