Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b5a0200 authored by Fedor Kudasov's avatar Fedor Kudasov
Browse files

Initialize TileRecord members in constructor 

Bug: 209459024
Test: m SystemUI-core
Change-Id: I18a73b63552181c0b9b9034563b15eb062e44707
parent 1c74441c

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;

packages/SystemUI/tests/src/com/android/systemui/qs/TileLayoutTest.java

+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