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

Merge \"QS: Make edit non-clickable when collapsed\" into nyc-mr1-dev

Browse Source 
am: 3795313116

Change-Id: I1f92e4476b06fda28b8d629c1009518e567bd4a1
This commit is contained in:
Jason Monk
2016-07-01 16:12:11 +00:00
committed by android-build-merger
parent 45ee8403d0 3795313116
commit d556df663c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStatusBarHeader.java
View File

@@ -271,7 +271,7 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements
final boolean isDemo = UserManager.isDeviceInDemoMode(mContext); final boolean isDemo = UserManager.isDeviceInDemoMode(mContext);
mMultiUserSwitch.setVisibility(mExpanded && mMultiUserSwitch.hasMultipleUsers() && !isDemo mMultiUserSwitch.setVisibility(mExpanded && mMultiUserSwitch.hasMultipleUsers() && !isDemo
? View.VISIBLE : View.INVISIBLE); ? View.VISIBLE : View.INVISIBLE);
mEdit.setVisibility(isDemo ? View.INVISIBLE : View.VISIBLE); mEdit.setVisibility(isDemo || !mExpanded ? View.INVISIBLE : View.VISIBLE);
} }
private void updateListeners() { private void updateListeners() {