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

Commit e377f441 authored by Fabian Kozynski's avatar Fabian Kozynski
Browse files

Dismantle remove labels prototype 

Test: manual
Bug: 171319433
Change-Id: I1ea97cec5c0d9b559213ca2adb9ddf7af60229a6
parent 11623bb1

packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QSTileView.java

+0 −2
Original line number Diff line number Diff line
@@ -50,6 +50,4 @@ public abstract class QSTileView extends LinearLayout { 
    public abstract void onStateChanged(State state);



    public abstract int getDetailY();



    public void setShowLabels(boolean show) {}

}

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

+0 −12
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout { 
    private int mMinRows = 1;

    private int mMaxColumns = TileLayout.NO_MAX_COLUMNS;



    private boolean mShowLabels = true;

    private final boolean mSideLabels;



    public PagedTileLayout(Context context, AttributeSet attrs) {
@@ -91,16 +90,6 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout { 
    }

    private int mLastMaxHeight = -1;



    @Override

    public void setShowLabels(boolean show) {

        mShowLabels = show;

        for (TileLayout p : mPages) {

            p.setShowLabels(show);

        }

        mDistributeTiles = true;

        requestLayout();

    }



    public void saveInstanceState(Bundle outState) {

        outState.putInt(CURRENT_PAGE, getCurrentItem());

    }
@@ -239,7 +228,6 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout { 
                        : R.layout.qs_paged_page, this, false);

        page.setMinRows(mMinRows);

        page.setMaxColumns(mMaxColumns);

        page.setShowLabels(mShowLabels);

        return page;

    }

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

+0 −2
Original line number Diff line number Diff line
@@ -847,8 +847,6 @@ public class QSPanel extends LinearLayout implements Tunable { 
        default void setExpansion(float expansion) {}



        int getNumVisibleTiles();



        default void setShowLabels(boolean show) {}

    }



    interface OnConfigurationChangedListener {

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

+0 −26
Original line number Diff line number Diff line
@@ -124,7 +124,6 @@ public class QSPanelController extends QSPanelControllerBase<QSPanel> { 
        updateMediaDisappearParameters();



        mTunerService.addTunable(mView, QS_SHOW_BRIGHTNESS);

        mTunerService.addTunable(mTunable, QS_REMOVE_LABELS);

        mView.updateResources();

        if (mView.isListening()) {

            refreshAllTiles();
@@ -137,13 +136,6 @@ public class QSPanelController extends QSPanelControllerBase<QSPanel> { 
        }

    }



    @Override

    boolean switchTileLayout(boolean force) {

        boolean result = super.switchTileLayout(force);

        getTileLayout().setShowLabels(mShowLabels);

        return result;

    }



    @Override

    protected QSTileRevealController createTileRevealController() {

        return mQsTileRevealControllerFactory.create(
@@ -152,7 +144,6 @@ public class QSPanelController extends QSPanelControllerBase<QSPanel> { 


    @Override

    protected void onViewDetached() {

        mTunerService.removeTunable(mTunable);

        mTunerService.removeTunable(mView);

        mView.removeOnConfigurationChangedListener(mOnConfigurationChangedListener);

        if (mBrightnessMirrorController != null) {
@@ -318,22 +309,5 @@ public class QSPanelController extends QSPanelControllerBase<QSPanel> { 
    public boolean isExpanded() {

        return mView.isExpanded();

    }



    private TunerService.Tunable mTunable = new TunerService.Tunable() {

        @Override

        public void onTuningChanged(String key, String newValue) {

            if (QS_REMOVE_LABELS.equals(key)) {

                if (!mQSLabelFlag) return;

                boolean newShowLabels = newValue == null || "0".equals(newValue);

                if (mShowLabels == newShowLabels) return;

                mShowLabels = newShowLabels;

                for (TileRecord t : mRecords) {

                    t.tileView.setShowLabels(mShowLabels);

                }

                getTileLayout().setShowLabels(mShowLabels);

                mView.requestLayout();

            }

        }

    };

}

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

+0 −1
Original line number Diff line number Diff line
@@ -198,7 +198,6 @@ public abstract class QSPanelControllerBase<T extends QSPanel> extends ViewContr 
        final TileRecord r = new TileRecord();

        r.tile = tile;

        r.tileView = mHost.createTileView(tile, collapsedView);

        r.tileView.setShowLabels(mShowLabels);

        mView.addTile(r);

        mRecords.add(r);

        mCachedSpecs = getTilesSpecs();