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

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

Browse Source 
* commit '48c9b6ab3d339c06afbc62abe94efcc41def5d1c':
  Show clear all when returning from flip quick settings.
This commit is contained in:
Mike Cleron
2012-10-17 13:52:05 -07:00
committed by Android Git Automerger
parent 138f27d0d8 48c9b6ab3d
commit 99fc40bd52
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 if (mHasFlipSettings
&& mFlipSettingsView != null && mFlipSettingsView != null
&& mFlipSettingsView.getVisibility() == View.VISIBLE) { && mFlipSettingsView.getVisibility() == View.VISIBLE
// the flip settings panel is showing; we should not be shown && mScrollView.getVisibility() != View.VISIBLE) {
// the flip settings panel is unequivocally showing; we should not be shown
mClearButton.setVisibility(View.INVISIBLE); mClearButton.setVisibility(View.INVISIBLE);
} else if (mClearButton.isShown()) { } else if (mClearButton.isShown()) {
if (clearable != (mClearButton.getAlpha() == 1.0f)) { if (clearable != (mClearButton.getAlpha() == 1.0f)) {