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

am e663925f: Merge "Show clear all when returning from flip quick settings." into jb-mr1-dev

Browse Source 
* commit 'e663925f855ab4390a0e0bd3c9713ca948076ec1':
  Show clear all when returning from flip quick settings.
This commit is contained in:
Mike Cleron
2012-10-17 13:49:00 -07:00
committed by Android Git Automerger
parent 16c156ff0c e663925f85
commit 48c9b6ab3d
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
View File

@@ -1084,8 +1084,9 @@ public class PhoneStatusBar extends BaseStatusBar {
if (mHasFlipSettings
&& mFlipSettingsView != null
&& mFlipSettingsView.getVisibility() == View.VISIBLE) {
// the flip settings panel is showing; we should not be shown
&& mFlipSettingsView.getVisibility() == View.VISIBLE
&& mScrollView.getVisibility() != View.VISIBLE) {
// the flip settings panel is unequivocally showing; we should not be shown
mClearButton.setVisibility(View.INVISIBLE);
} else if (mClearButton.isShown()) {
if (clearable != (mClearButton.getAlpha() == 1.0f)) {