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

Merge "QS: Allow changes between open detail panels" into mnc-dev

Browse Source
This commit is contained in:
Jason Monk
2015-06-10 22:27:21 +00:00
committed by Android (Google) Code Review
parent 1955ee57b3 efe3d3f988
commit d9d529497d
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -360,7 +360,7 @@ public class QSPanel extends ViewGroup {
}
private void handleShowDetailTile(TileRecord r, boolean show) {
if ((mDetailRecord != null) == show) return;
if ((mDetailRecord != null) == show && mDetailRecord == r) return;
if (show) {
r.detailAdapter = r.tile.getDetailAdapter();
@@ -373,7 +373,8 @@ public class QSPanel extends ViewGroup {
}
private void handleShowDetailImpl(Record r, boolean show, int x, int y) {
if ((mDetailRecord != null) == show) return; // already in right state
boolean visibleDiff = (mDetailRecord != null) != show;
if (!visibleDiff && mDetailRecord == r) return; // already in right state
DetailAdapter detailAdapter = null;
AnimatorListener listener = null;
if (show) {
@@ -399,7 +400,7 @@ public class QSPanel extends ViewGroup {
mContext.getString(detailAdapter.getTitle())));
setDetailRecord(r);
listener = mHideGridContentWhenDone;
if (r instanceof TileRecord) {
if (r instanceof TileRecord && visibleDiff) {
((TileRecord) r).openingDetail = true;
}
} else {
@@ -411,7 +412,9 @@ public class QSPanel extends ViewGroup {
}
sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);
fireShowingDetail(show ? detailAdapter : null);
mClipper.animateCircularClip(x, y, show, listener);
if (visibleDiff) {
mClipper.animateCircularClip(x, y, show, listener);
}
}
private void setGridContentVisibility(boolean visible) {