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

Merge "Protect against monkey crash" into nyc-dev

Browse Source 
am: 0a6495dc60

* commit '0a6495dc600b20b79f890a86134e15c23d28054d':
  Protect against monkey crash
This commit is contained in:
Jason Monk
2016-02-17 15:54:45 +00:00
committed by android-build-merger
parent d0cc5eaaf9 0a6495dc60
commit ae535993e7
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,16 +90,20 @@ public class QSCustomizer extends LinearLayout implements AnimatorListener, OnCl
}
public void show(int x, int y) {
isShown = true;
mPhoneStatusBar.getStatusBarWindow().addView(this);
setTileSpecs();
mClipper.animateCircularClip(x, y, true, this);
new TileQueryHelper(mContext, mHost).setListener(mTileAdapter);
if (!isShown) {
isShown = true;
mPhoneStatusBar.getStatusBarWindow().addView(this);
setTileSpecs();
mClipper.animateCircularClip(x, y, true, this);
new TileQueryHelper(mContext, mHost).setListener(mTileAdapter);
}
}
public void hide(int x, int y) {
isShown = false;
mClipper.animateCircularClip(x, y, false, this);
if (isShown) {
isShown = false;
mClipper.animateCircularClip(x, y, false, this);
}
}
public boolean isCustomizing() {