commit a59215aa4dcaa115b77a16c1f80a8099f58108a7
author Amin Shaikh <ashaikh@google.com> Mon Apr 23 08:52:38 2018 -0400
committer Amin Shaikh <ashaikh@google.com> Mon Apr 23 08:52:38 2018 -0400
tree 73f9f99fae1f6a4c3854c21ee8bfd5170607ff7d
parent 5bdf9530a04dd4284498eb31c5e5fb0f8e6987a3

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

diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java b/packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java
index fd9ddb0..b7907a6 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 @@
         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) {

packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java

diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
index 5d7dcbb..2dcb723 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 @@
 
     @Override
     public void onAttachedToWindow() {
+        super.onAttachedToWindow();
         Dependency.get(StatusBarIconController.class).addIconGroup(mIconManager);
         requestApplyInsets();
     }