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

Commit 8f4f7bb7 authored by cristianomatos's avatar cristianomatos Committed by fuzz
Browse files

Fix alignment of small tiles 

Before fix: https://lh6.googleusercontent.com/_aMa9Ary2dM4eaX2JfSvyVVVT1EL-_J4X9I-8d5Z1zA=w322-h572-no
After fix: https://lh6.googleusercontent.com/-c2G5sUWLmfA/U53SxPccsyI/AAAAAAAAB5A/aD8xNO1TRq4/w322-h572-no/Screenshot_2014-06-15-14-05-48.png

Tested on Hammerhead and I9300

PS8  - shrink text and padding a bit in attempt to fit 3 lines text labels
PS9  - adjust padding for small tiles
PS11 - shrink text only on small screen phones

Change-Id: Ifb9b041feb2487ea9eb6db60bf1a7368c5740c15
parent a5ff4ed7

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

+0 −8
Original line number Diff line number Diff line
@@ -96,14 +96,6 @@ public class QuickSettingsTile implements OnClickListener { 
                tv.setPadding(0, mTileTextPadding, 0, 0);

            }

        }

        View image = getImageView();

        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);

        }

    }



    protected View getImageView() {

packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsContainerView.java

+8 −2
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.content.res.TypedArray; 
import android.os.UserHandle;

import android.provider.Settings;

import android.util.AttributeSet;

import android.util.DisplayMetrics;

import android.view.View;

import android.view.ViewGroup;

import android.widget.FrameLayout;
@@ -41,8 +42,9 @@ public class QuickSettingsContainerView extends FrameLayout { 
    // The gap between tiles in the QuickSettings grid

    private float mCellGap;



    private float mPadding4Tiles = -8.0f;

    private float mPadding4Tiles = -4.0f;

    private float mPadding3Tiles = 0.0f;

    private float mSmallSize4Tiles = 9.0f;

    private float mSize4Tiles = 10.0f;

    private float mSize3Tiles = 12.0f;
@@ -203,7 +205,11 @@ public class QuickSettingsContainerView extends FrameLayout { 
        mSmallIcons = Settings.System.getIntForUser(resolver,

                Settings.System.QUICK_SETTINGS_SMALL_ICONS, 0, UserHandle.USER_CURRENT) == 1;

        if (mSmallIcons) {

            return mTextSize = (int) mSize4Tiles;

            int dpi = mContext.getResources().getDisplayMetrics().densityDpi;

            boolean isTablet = mContext.getResources().

                    getBoolean(R.bool.config_recents_interface_for_tablets);

            return mTextSize = (isTablet || dpi > DisplayMetrics.DENSITY_HIGH) ?

                    (int) mSize4Tiles : (int) mSmallSize4Tiles;

        } else {

            return mTextSize = (int) mSize3Tiles;

        }