diff options
| author | 2018-04-23 14:56:01 +0000 | |
|---|---|---|
| committer | 2018-04-23 14:56:01 +0000 | |
| commit | 4a32b5180092847b33307b361a61038da3b8c52f (patch) | |
| tree | 1b482a091344273095e3e2e369cd20ab0992a5d2 | |
| parent | b2bbf2f12c4343e78570292e01de5aeb21a49120 (diff) | |
| parent | a59215aa4dcaa115b77a16c1f80a8099f58108a7 (diff) | |
Merge "Make settings icon invisible when QS is collapsed." into pi-dev
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java | 1 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java b/packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java index fd9ddb0fd0ac..b7907a605ca5 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 5d7dcbbf08d1..2dcb72362b0a 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(); } |