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

Commit b70ab625 authored by Jo De Boeck's avatar Jo De Boeck Committed by fuzz
Browse files

QS: Make it possible to show smaller tiles (1/2) 

* Remove text and show more tiles on one row

ps18: set icon margin based on density of device
ps19: adjust the margin
ps20: implement show text under the tiles
ps21: fix typo
ps22: underp

Change-Id: Ie247aba1ae5fbdb8f5298e30fb2f04a985e73532
parent 1382474a

core/java/android/provider/Settings.java

+8 −0
Original line number Diff line number Diff line
@@ -2772,6 +2772,14 @@ public final class Settings { 
         */

        public static final String QUICK_SETTINGS_TILES = "quick_settings_tiles";





        /**

         * Quick Settings show small icons

         *

         * @hide

         */

        public static final String QUICK_SETTINGS_SMALL_ICONS = "qs_small_icons";



        /**

         * Enable looking up of phone numbers of nearby places

         *

packages/SystemUI/res/values-land/config.xml

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 


    <!-- The number of columns in the QuickSettings -->

    <integer name="quick_settings_num_columns">6</integer>

    <integer name="quick_settings_num_columns_small">8</integer>



    <!-- The number of columns that the top level tiles span in the QuickSettings -->

    <integer name="quick_settings_user_time_settings_tile_span">2</integer>

packages/SystemUI/res/values-sw600dp/config.xml

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 


    <!-- The number of columns in the QuickSettings -->

    <integer name="quick_settings_num_columns">3</integer>

    <integer name="quick_settings_num_columns_small">4</integer>



    <!-- The number of columns that the top level tiles span in the QuickSettings -->

    <integer name="quick_settings_user_time_settings_tile_span">1</integer>

packages/SystemUI/res/values/config.xml

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ 


    <!-- The number of columns in the QuickSettings -->

    <integer name="quick_settings_num_columns">3</integer>

    <integer name="quick_settings_num_columns_small">4</integer>



    <!-- The number of columns that the top level tiles span in the QuickSettings -->

    <integer name="quick_settings_user_time_settings_tile_span">1</integer>

packages/SystemUI/src/com/android/systemui/quicksettings/QuickSettingsTile.java

+25 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ import android.net.Uri; 
import android.os.RemoteException;

import android.os.UserHandle;

import android.provider.Settings;

import android.util.DisplayMetrics;

import android.view.LayoutInflater;

import android.view.View;

import android.view.View.OnClickListener;
@@ -34,6 +35,8 @@ public class QuickSettingsTile implements OnClickListener { 
    protected final int mTileLayout;

    protected int mDrawable;

    protected String mLabel;

    protected int mTileTextSize;

    protected int mTileTextPadding;

    protected PhoneStatusBar mStatusbarService;

    protected QuickSettingsController mQsc;

    protected SharedPreferences mPrefs;
@@ -54,6 +57,9 @@ public class QuickSettingsTile implements OnClickListener { 


    public void setupQuickSettingsTile(LayoutInflater inflater,

            QuickSettingsContainerView container) {

        container.updateResources();

        mTileTextSize = container.getTileTextSize();

        mTileTextPadding = container.getTileTextPadding();

        mTile = (QuickSettingsTileView) inflater.inflate(

                R.layout.quick_settings_tile, container, false);

        mTile.setContent(mTileLayout, inflater);
@@ -80,6 +86,23 @@ public class QuickSettingsTile implements OnClickListener { 
        }

    }



    public void switchToSmallIcons() {

        TextView tv = (TextView) mTile.findViewById(R.id.text);

        if (tv != null) {

            tv.setText(mLabel);

            tv.setTextSize(mTileTextSize);

            tv.setPadding(0, mTileTextPadding, 0, 0);

        }

        View image = mTile.findViewById(R.id.image);

        if (image != null) {

            MarginLayoutParams params = (MarginLayoutParams) image.getLayoutParams();

            int margin = mContext.getResources().getDimensionPixelSize(

                    R.dimen.qs_tile_ribbon_icon_margin);

            params.topMargin = params.bottomMargin = margin;

            image.setLayoutParams(params);

        }

    }



    void onPostCreate() {}



    public void onDestroy() {}
@@ -98,6 +121,8 @@ public class QuickSettingsTile implements OnClickListener { 
        TextView tv = (TextView) mTile.findViewById(R.id.text);

        if (tv != null) {

            tv.setText(mLabel);

            tv.setTextSize(mTileTextSize);

            tv.setPadding(0, mTileTextPadding, 0, 0);

        }

        View image = mTile.findViewById(R.id.image);

        if (image != null && image instanceof ImageView) {