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

Commit 77a9a1c7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove config specific size for HeaderTileLayout" into qt-dev

parents 131a7fe8 7a4e3312

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

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

    <!-- Standard notification width + gravity for tablet large screen device -->

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

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





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

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



</resources>

</resources>

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

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

    <!-- Standard notification width + gravity -->

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

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





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

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

</resources>
 
</resources>

packages/SystemUI/res/values/dimens.xml

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

    <dimen name="qs_tile_margin_top">18dp</dimen>

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

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

    <dimen name="qs_quick_tile_size">48dp</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_quick_tile_padding">12dp</dimen>

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

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

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

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

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

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

            super(context);

            setClipChildren(false);

            setClipChildren(false);

            setClipToPadding(false);

            setClipToPadding(false);

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

                    LayoutParams.MATCH_PARENT);

            lp.gravity = Gravity.CENTER_HORIZONTAL;

            setLayoutParams(lp);

        }

        }





        @Override

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

            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() {

        private LayoutParams generateTileLayoutParams() {

            LayoutParams lp = new LayoutParams(mCellWidth, mCellHeight);

            LayoutParams lp = new LayoutParams(mCellWidth, mCellHeight);

            return lp;

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

            mCellWidth = mContext.getResources().getDimensionPixelSize(R.dimen.qs_quick_tile_size);

            mCellHeight = mCellWidth;

            mCellHeight = mCellWidth;





            updateLayoutParams();



            return false;

            return false;

        }

        }