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

Merge "Hide QS customizer correctly"

Browse Source 
am: 03e4eb32fe

Change-Id: I8c1998de76beee26b703781a6f883e9efd24bde3
This commit is contained in:
Jason Monk
2016-10-19 15:15:43 +00:00
committed by android-build-merger
parent cedb97bfb6 03e4eb32fe
commit fb56958223
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/qs/QSPanel.java
View File

@@ -217,7 +217,7 @@ public class QSPanel extends LinearLayout implements Tunable, Callback {
} }
public void onCollapse() { public void onCollapse() {
if (mCustomizePanel != null && mCustomizePanel.isCustomizing()) { if (mCustomizePanel != null && mCustomizePanel.isShown()) {
mCustomizePanel.hide(mCustomizePanel.getWidth() / 2, mCustomizePanel.getHeight() / 2); mCustomizePanel.hide(mCustomizePanel.getWidth() / 2, mCustomizePanel.getHeight() / 2);
} }
} }
@@ -396,7 +396,7 @@ public class QSPanel extends LinearLayout implements Tunable, Callback {
} }
public void closeDetail() { public void closeDetail() {
if (mCustomizePanel != null && mCustomizePanel.isCustomizing()) { if (mCustomizePanel != null && mCustomizePanel.isShown()) {
// Treat this as a detail panel for now, to make things easy. // Treat this as a detail panel for now, to make things easy.
mCustomizePanel.hide(mCustomizePanel.getWidth() / 2, mCustomizePanel.getHeight() / 2); mCustomizePanel.hide(mCustomizePanel.getWidth() / 2, mCustomizePanel.getHeight() / 2);
return; return;

6
packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizer.java
View File

@@ -162,6 +162,10 @@ public class QSCustomizer extends LinearLayout implements OnMenuItemClickListene
} }
} }
public boolean isShown() {
return isShown;
}
private void setCustomizing(boolean customizing) { private void setCustomizing(boolean customizing) {
mCustomizing = customizing; mCustomizing = customizing;
mQsContainer.notifyCustomizeChanged(); mQsContainer.notifyCustomizeChanged();
@@ -216,7 +220,9 @@ public class QSCustomizer extends LinearLayout implements OnMenuItemClickListene
private final AnimatorListener mExpandAnimationListener = new AnimatorListenerAdapter() { private final AnimatorListener mExpandAnimationListener = new AnimatorListenerAdapter() {
@Override @Override
public void onAnimationEnd(Animator animation) { public void onAnimationEnd(Animator animation) {
if (isShown) {
setCustomizing(true); setCustomizing(true);
}
mNotifQsContainer.setCustomizerAnimating(false); mNotifQsContainer.setCustomizerAnimating(false);
} }