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

Commit 62d59cc4 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Adjust QS Header in landscape"

parents 5f5d707b fece2ab2

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

+2 −0
Original line number Diff line number Diff line
@@ -93,4 +93,6 @@ 


    <dimen name="navigation_key_width">128dp</dimen>

    <dimen name="navigation_key_padding">25dp</dimen>



    <dimen name="qs_expand_margin">0dp</dimen>

</resources>

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

+2 −0
Original line number Diff line number Diff line
@@ -18,4 +18,6 @@ 
<resources>

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

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



    <dimen name="qs_expand_margin">32dp</dimen>

</resources>

packages/SystemUI/res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -186,6 +186,7 @@ 
    <dimen name="qs_detail_empty_text_size">14sp</dimen>

    <dimen name="qs_data_usage_text_size">14sp</dimen>

    <dimen name="qs_data_usage_usage_text_size">36sp</dimen>

    <dimen name="qs_expand_margin">0dp</dimen>



    <dimen name="segmented_button_spacing">0dp</dimen>

    <dimen name="borderless_button_radius">2dp</dimen>

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

+23 −6
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.systemui.qs; 


import android.content.Context;

import android.content.res.ColorStateList;

import android.content.res.Configuration;

import android.util.AttributeSet;

import android.view.Gravity;

import android.view.View;
@@ -102,6 +103,8 @@ public class QuickQSPanel extends QSPanel { 


    private static class HeaderTileLayout extends LinearLayout implements QSTileLayout {



        private final ImageView mDownArrow;



        public HeaderTileLayout(Context context) {

            super(context);

            setClipChildren(false);
@@ -111,16 +114,30 @@ public class QuickQSPanel extends QSPanel { 


            int padding =

                    mContext.getResources().getDimensionPixelSize(R.dimen.qs_quick_tile_padding);

            ImageView downArrow = new ImageView(context);

            downArrow.setImageResource(R.drawable.ic_expand_more);

            downArrow.setImageTintList(ColorStateList.valueOf(context.getResources().getColor(

            mDownArrow = new ImageView(context);

            mDownArrow.setImageResource(R.drawable.ic_expand_more);

            mDownArrow.setImageTintList(ColorStateList.valueOf(context.getResources().getColor(

                    android.R.color.white, null)));

            downArrow.setLayoutParams(generateLayoutParams());

            downArrow.setPadding(padding, padding, padding, padding);

            addView(downArrow);

            mDownArrow.setLayoutParams(generateLayoutParams());

            mDownArrow.setPadding(padding, padding, padding, padding);

            updateDownArrowMargin();

            addView(mDownArrow);

            setOrientation(LinearLayout.HORIZONTAL);

        }



        @Override

        protected void onConfigurationChanged(Configuration newConfig) {

            super.onConfigurationChanged(newConfig);

            updateDownArrowMargin();

        }



        private void updateDownArrowMargin() {

            LayoutParams params = (LayoutParams) mDownArrow.getLayoutParams();

            params.setMarginStart(mContext.getResources().getDimensionPixelSize(

                    R.dimen.qs_expand_margin));

            mDownArrow.setLayoutParams(params);

        }



        @Override

        public void addTile(TileRecord tile) {

            addView(tile.tileView, getChildCount() - 1 /* Leave icon at end */,