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

Commit 72794745 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Automerger Merge Worker
Browse files

Merge "Fix dynamic columns in QSCustomizer" into sc-dev am: 68da8f75 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13483072

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I08390bfb66f0b46977a74c1e22599c338ac958b8
parents 174b804e 68da8f75

packages/SystemUI/src/com/android/systemui/qs/customize/QSCustomizerController.java

+6 −0
Original line number Diff line number Diff line
@@ -102,6 +102,12 @@ public class QSCustomizerController extends ViewController<QSCustomizer> { 
        public void onConfigChanged(Configuration newConfig) {

            mView.updateNavBackDrop(newConfig, mLightBarController);

            mView.updateResources();

            if (mTileAdapter.updateNumColumns()) {

                RecyclerView.LayoutManager lm = mView.getRecyclerView().getLayoutManager();

                if (lm instanceof GridLayoutManager) {

                    ((GridLayoutManager) lm).setSpanCount(mTileAdapter.getNumColumns());

                }

            }

        }

    };

packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java

+16 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta 
    private final UiEventLogger mUiEventLogger;

    private final AccessibilityDelegateCompat mAccessibilityDelegate;

    private RecyclerView mRecyclerView;

    private final int mNumColumns;

    private int mNumColumns;



    @Inject

    public TileAdapter(Context context, QSTileHost qsHost, UiEventLogger uiEventLogger) {
@@ -123,6 +123,21 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta 
        mRecyclerView = null;

    }



    /**

     * Update the number of columns to show, from resources.

     *

     * @return {@code true} if the number of columns changed, {@code false} otherwise

     */

    public boolean updateNumColumns() {

        int numColumns = mContext.getResources().getInteger(R.integer.quick_settings_num_columns);

        if (numColumns != mNumColumns) {

            mNumColumns = numColumns;

            return true;

        } else {

            return false;

        }

    }



    public int getNumColumns() {

        return mNumColumns;

    }