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

Merge "Fixes for QS:" into jb-mr1-dev

Browse Source
This commit is contained in:
Daniel Sandler
2012-10-17 11:05:20 -07:00
committed by Android (Google) Code Review
parent 144d405511 6e2810bb98
commit f06125aab0
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1079,7 +1079,12 @@ public class PhoneStatusBar extends BaseStatusBar {
+ " any=" + any + " clearable=" + clearable); + " any=" + any + " clearable=" + clearable);
} }
if (mClearButton.isShown()) { if (mHasFlipSettings
&& mFlipSettingsView != null
&& mFlipSettingsView.getVisibility() == View.VISIBLE) {
// the flip settings panel is showing; we should not be shown
mClearButton.setVisibility(View.INVISIBLE);
} else if (mClearButton.isShown()) {
if (clearable != (mClearButton.getAlpha() == 1.0f)) { if (clearable != (mClearButton.getAlpha() == 1.0f)) {
ObjectAnimator clearAnimation = ObjectAnimator.ofFloat( ObjectAnimator clearAnimation = ObjectAnimator.ofFloat(
mClearButton, "alpha", clearable ? 1.0f : 0.0f).setDuration(250); mClearButton, "alpha", clearable ? 1.0f : 0.0f).setDuration(250);
@@ -1522,6 +1527,10 @@ public class PhoneStatusBar extends BaseStatusBar {
mStatusBarView.collapseAllPanels(true); mStatusBarView.collapseAllPanels(true);
} }
void makeExpandedInvisibleSoon() {
mHandler.postDelayed(new Runnable() { public void run() { makeExpandedInvisible(); }}, 50);
}
void makeExpandedInvisible() { void makeExpandedInvisible() {
if (SPEW) Slog.d(TAG, "makeExpandedInvisible: mExpandedVisible=" + mExpandedVisible if (SPEW) Slog.d(TAG, "makeExpandedInvisible: mExpandedVisible=" + mExpandedVisible
+ " mExpandedVisible=" + mExpandedVisible); + " mExpandedVisible=" + mExpandedVisible);

3
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java
View File

@@ -154,7 +154,8 @@ public class PhoneStatusBarView extends PanelBar {
@Override @Override
public void onAllPanelsCollapsed() { public void onAllPanelsCollapsed() {
super.onAllPanelsCollapsed(); super.onAllPanelsCollapsed();
mBar.makeExpandedInvisible(); // give animations time to settle
mBar.makeExpandedInvisibleSoon();
mFadingPanel = null; mFadingPanel = null;
mLastFullyOpenedPanel = null; mLastFullyOpenedPanel = null;
} }