Merge "QS: Allow changes between open detail panels" into mnc-dev (d9d52949) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/QSPanel.java

+7 −4

Original line number	Diff line number	Diff line
		@@ -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,8 +412,10 @@ public class QSPanel extends ViewGroup {
		}
		sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);
		fireShowingDetail(show ? detailAdapter : null);
		if (visibleDiff) {
		mClipper.animateCircularClip(x, y, show, listener);
		}
		}

		private void setGridContentVisibility(boolean visible) {
		int newVis = visible ? VISIBLE : INVISIBLE;