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

Commit 6649fb33 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by android-build-merger
Browse files

Merge "Remove config specific size for HeaderTileLayout" into qt-dev am: 77a9a1c7 

am: 4d8a54e1

Change-Id: I5746773082e684d117f5ac01d51f0b0ddf9d678c
parents 511f4d18 4d8a54e1

packages/SystemUI/res/values-sw900dp-land/dimen.xml

+0 −3
Original line number Diff line number Diff line
@@ -19,8 +19,5 @@ 
    <!-- Standard notification width + gravity for tablet large screen device -->

    <dimen name="notification_panel_width">544dp</dimen>



    <!-- Maximum width of quick quick settings panel. -->

    <dimen name="qs_quick_layout_width">478dp</dimen>



</resources>

packages/SystemUI/res/values-w550dp-land/dimens.xml

+0 −2
Original line number Diff line number Diff line
@@ -19,6 +19,4 @@ 
    <!-- Standard notification width + gravity -->

    <dimen name="notification_panel_width">544dp</dimen>



    <!-- Maximum width of quick quick settings panel. -->

    <dimen name="qs_quick_layout_width">478dp</dimen>

</resources>

packages/SystemUI/res/values/dimens.xml

+0 −2
Original line number Diff line number Diff line
@@ -433,8 +433,6 @@ 
    <dimen name="qs_tile_margin_top">18dp</dimen>

    <dimen name="qs_tile_background_size">44dp</dimen>

    <dimen name="qs_quick_tile_size">48dp</dimen>

    <!-- Maximum width of quick quick settings panel. Defaults to MATCH_PARENT-->

    <dimen name="qs_quick_layout_width">-1px</dimen>

    <dimen name="qs_quick_tile_padding">12dp</dimen>

    <dimen name="qs_header_gear_translation">16dp</dimen>

    <dimen name="qs_header_tile_margin_horizontal">4dp</dimen>

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

+4 −9
Original line number Diff line number Diff line
@@ -195,6 +195,10 @@ public class QuickQSPanel extends QSPanel { 
            super(context);

            setClipChildren(false);

            setClipToPadding(false);

            LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT,

                    LayoutParams.MATCH_PARENT);

            lp.gravity = Gravity.CENTER_HORIZONTAL;

            setLayoutParams(lp);

        }



        @Override
@@ -208,13 +212,6 @@ public class QuickQSPanel extends QSPanel { 
            updateResources();

        }



        private void updateLayoutParams() {

            int width = getResources().getDimensionPixelSize(R.dimen.qs_quick_layout_width);

            LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(width, LayoutParams.MATCH_PARENT);

            lp.gravity = Gravity.CENTER_HORIZONTAL;

            setLayoutParams(lp);

        }



        private LayoutParams generateTileLayoutParams() {

            LayoutParams lp = new LayoutParams(mCellWidth, mCellHeight);

            return lp;
@@ -246,8 +243,6 @@ public class QuickQSPanel extends QSPanel { 
            mCellWidth = mContext.getResources().getDimensionPixelSize(R.dimen.qs_quick_tile_size);

            mCellHeight = mCellWidth;



            updateLayoutParams();



            return false;

        }