Merge "Initialize TileRecord members in constructor" (ccbc3702) · Commits · e / os / android_frameworks_base

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

+7 −3

Original line number	Diff line number	Diff line
		@@ -219,9 +219,8 @@ public abstract class QSPanelControllerBase<T extends QSPanel> extends ViewContr
		}

		private void addTile(final QSTile tile, boolean collapsedView) {
		final TileRecord r = new TileRecord();
		r.tile = tile;
		r.tileView = mHost.createTileView(getContext(), tile, collapsedView);
		final TileRecord r =
		new TileRecord(tile, mHost.createTileView(getContext(), tile, collapsedView));
		mView.addTile(r);
		mRecords.add(r);
		mCachedSpecs = getTilesSpecs();
		@@ -418,6 +417,11 @@ public abstract class QSPanelControllerBase<T extends QSPanel> extends ViewContr

		/** */
		public static final class TileRecord extends QSPanel.Record {
		public TileRecord(QSTile tile, com.android.systemui.plugins.qs.QSTileView tileView) {
		this.tile = tile;
		this.tileView = tileView;
		}

		public QSTile tile;
		public com.android.systemui.plugins.qs.QSTileView tileView;
		public boolean scanState;

+3 −4

Original line number	Diff line number	Diff line
		@@ -58,10 +58,9 @@ public class TileLayoutTest extends SysuiTestCase {
		}

		private QSPanelControllerBase.TileRecord createTileRecord() {
		QSPanelControllerBase.TileRecord tileRecord = new QSPanelControllerBase.TileRecord();
		tileRecord.tile = mock(QSTile.class);
		tileRecord.tileView = spy(new QSTileViewImpl(mContext, new QSIconViewImpl(mContext)));
		return tileRecord;
		return new QSPanelControllerBase.TileRecord(
		mock(QSTile.class),
		spy(new QSTileViewImpl(mContext, new QSIconViewImpl(mContext))));
		}

		@Test