Merge "QS: Defer tile view updates when opening the detail panel." into mnc-dev (b7c9b225) · Commits · e / os / android_frameworks_base

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

+23 −3

Original line number	Diff line number	Diff line
		@@ -247,6 +247,12 @@ public class QSPanel extends ViewGroup {
		}
		}

		private void drawTile(TileRecord r, QSTile.State state) {
		final int visibility = state.visible ? VISIBLE : GONE;
		setTileVisibility(r.tileView, visibility);
		r.tileView.onStateChanged(state);
		}

		private void addTile(final QSTile<?> tile) {
		final TileRecord r = new TileRecord();
		r.tile = tile;
		@@ -255,9 +261,9 @@ public class QSPanel extends ViewGroup {
		final QSTile.Callback callback = new QSTile.Callback() {
		@Override
		public void onStateChanged(QSTile.State state) {
		int visibility = state.visible ? VISIBLE : GONE;
		setTileVisibility(r.tileView, visibility);
		r.tileView.onStateChanged(state);
		if (!r.openingDetail) {
		drawTile(r, state);
		}
		}
		@Override
		public void onShowDetail(boolean show) {
		@@ -372,6 +378,9 @@ public class QSPanel extends ViewGroup {
		MetricsLogger.visible(mContext, detailAdapter.getMetricsCategory());
		setDetailRecord(r);
		listener = mHideGridContentWhenDone;
		if (r instanceof TileRecord) {
		((TileRecord) r).openingDetail = true;
		}
		} else {
		MetricsLogger.hidden(mContext, mDetailRecord.detailAdapter.getMetricsCategory());
		mClosingDetail = true;
		@@ -557,6 +566,7 @@ public class QSPanel extends ViewGroup {
		int row;
		int col;
		boolean scanState;
		boolean openingDetail;
		}

		private final AnimatorListenerAdapter mTeardownDetailWhenDone = new AnimatorListenerAdapter() {
		@@ -572,6 +582,7 @@ public class QSPanel extends ViewGroup {
		// If we have been cancelled, remove the listener so that onAnimationEnd doesn't get
		// called, this will avoid accidentally turning off the grid when we don't want to.
		animation.removeListener(this);
		redrawTile();
		};

		@Override
		@@ -579,6 +590,15 @@ public class QSPanel extends ViewGroup {
		// Only hide content if still in detail state.
		if (mDetailRecord != null) {
		setGridContentVisibility(false);
		redrawTile();
		}
		}

		private void redrawTile() {
		if (mDetailRecord instanceof TileRecord) {
		final TileRecord tileRecord = (TileRecord) mDetailRecord;
		tileRecord.openingDetail = false;
		drawTile(tileRecord, tileRecord.tile.getState());
		}
		}
		};

packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -95,7 +95,6 @@ public class DndTile extends QSTile<QSTile.BooleanState> {
		} else {
		int zen = Prefs.getInt(mContext, Prefs.Key.DND_FAVORITE_ZEN, Global.ZEN_MODE_ALARMS);
		mController.setZen(zen, null, TAG);
		refreshState(zen); // this one's optimistic
		showDetail(true);
		}
		}