Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make settings icon invisible when QS is collapsed." into pi-dev

Browse Source 
am: 4a32b51800

Change-Id: I19fb5223a5715c83eb708431eaee8632cb960575
This commit is contained in:
Amin Shaikh
2018-04-23 08:10:56 -07:00
committed by android-build-merger
parent b2ff0c0119 4a32b51800
commit c1ed08736b
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/src/com/android/systemui/qs/QSFooterImpl.java
View File

@@ -284,6 +284,7 @@ public class QSFooterImpl extends FrameLayout implements QSFooter,
final boolean isDemo = UserManager.isDeviceInDemoMode(mContext); final boolean isDemo = UserManager.isDeviceInDemoMode(mContext);
mMultiUserSwitch.setVisibility(showUserSwitcher(isDemo) ? View.VISIBLE : View.INVISIBLE); mMultiUserSwitch.setVisibility(showUserSwitcher(isDemo) ? View.VISIBLE : View.INVISIBLE);
mEdit.setVisibility(isDemo || !mExpanded ? View.INVISIBLE : View.VISIBLE); mEdit.setVisibility(isDemo || !mExpanded ? View.INVISIBLE : View.VISIBLE);
mSettingsButton.setVisibility(isDemo || !mExpanded ? View.INVISIBLE : View.VISIBLE);
} }
private boolean showUserSwitcher(boolean isDemo) { private boolean showUserSwitcher(boolean isDemo) {

1
packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
View File

@@ -366,6 +366,7 @@ public class QuickStatusBarHeader extends RelativeLayout implements
@Override @Override
public void onAttachedToWindow() { public void onAttachedToWindow() {
super.onAttachedToWindow();
Dependency.get(StatusBarIconController.class).addIconGroup(mIconManager); Dependency.get(StatusBarIconController.class).addIconGroup(mIconManager);
requestApplyInsets(); requestApplyInsets();
} }