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

Commit 8658042a authored by cjh1249131356's avatar cjh1249131356 Committed by Michael Bestas
Browse files

SystemUI: Align QS header with status bar 



* Use same padding & height logic from status bar for QS header.

Signed-off-by: default avatarcjh1249131356 <cjh1249131356@gmail.com>
Change-Id: I9fb922960519568f2388e8d4ee24ed47857234ed
parent 5ee0c9e4

packages/SystemUI/res/layout/quick_qs_status_icons.xml

+0 −3
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
    android:layout_height="@*android:dimen/quick_qs_offset_height"

    android:clipChildren="false"

    android:clipToPadding="false"

    android:minHeight="@dimen/qs_header_row_min_height"

    android:clickable="false"

    android:focusable="true"

    android:theme="@style/QSHeaderTheme">
@@ -39,7 +38,6 @@ 
            android:id="@+id/clock"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:minHeight="@dimen/qs_header_row_min_height"

            android:gravity="center_vertical|start"

            android:paddingStart="@dimen/status_bar_left_clock_starting_padding"

            android:paddingEnd="@dimen/status_bar_left_clock_end_padding"
@@ -64,7 +62,6 @@ 
        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="1"

        android:minHeight="@dimen/qs_header_row_min_height"

        android:minWidth="48dp"

        android:layout_marginStart="8dp"

        android:layout_gravity="end|center_vertical"

packages/SystemUI/res/layout/quick_status_bar_header_date_privacy.xml

+1 −3
Original line number Diff line number Diff line
@@ -25,14 +25,12 @@ 
    android:gravity="center"

    android:layout_gravity="top"

    android:orientation="horizontal"

    android:clickable="true"

    android:minHeight="48dp">

    android:clickable="true">



    <FrameLayout

        android:id="@+id/date_container"

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:minHeight="48dp"

        android:layout_weight="1"

        android:gravity="center_vertical|start" >

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

+13 −10
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu 
    private StatusBarContentInsetsProvider mInsetsProvider;



    private int mRoundedCornerPadding = 0;

    private int mStatusBarPaddingTop;

    private int mWaterfallTopInset;

    private int mCutOutPaddingLeft;

    private int mCutOutPaddingRight;
@@ -266,19 +267,20 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu 
        mRoundedCornerPadding = resources.getDimensionPixelSize(

                R.dimen.rounded_corner_content_padding);



        int qsOffsetHeight = SystemBarUtils.getQuickQsOffsetHeight(mContext);

        int statusBarHeight = SystemBarUtils.getStatusBarHeight(mContext);



        mDatePrivacyView.getLayoutParams().height =

                Math.max(qsOffsetHeight, mDatePrivacyView.getMinimumHeight());

        mStatusBarPaddingTop = resources.getDimensionPixelSize(

                R.dimen.status_bar_padding_top);



        mDatePrivacyView.getLayoutParams().height = statusBarHeight;

        mDatePrivacyView.setLayoutParams(mDatePrivacyView.getLayoutParams());



        mStatusIconsView.getLayoutParams().height =

                Math.max(qsOffsetHeight, mStatusIconsView.getMinimumHeight());

        mStatusIconsView.getLayoutParams().height = statusBarHeight;

        mStatusIconsView.setLayoutParams(mStatusIconsView.getLayoutParams());



        ViewGroup.LayoutParams lp = getLayoutParams();

        if (mQsDisabled) {

            lp.height = mStatusIconsView.getLayoutParams().height;

            lp.height = mStatusIconsView.getLayoutParams().height - mWaterfallTopInset;

        } else {

            lp.height = WRAP_CONTENT;

        }
@@ -302,8 +304,9 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu 
        }



        MarginLayoutParams qqsLP = (MarginLayoutParams) mHeaderQsPanel.getLayoutParams();

        qqsLP.topMargin = largeScreenHeaderActive || !mUseCombinedQSHeader ? mContext.getResources()

                .getDimensionPixelSize(R.dimen.qqs_layout_margin_top) : qsOffsetHeight;

        qqsLP.topMargin = largeScreenHeaderActive || !mUseCombinedQSHeader

                ? mContext.getResources().getDimensionPixelSize(R.dimen.qqs_layout_margin_top)

                : SystemBarUtils.getQuickQsOffsetHeight(mContext);

        mHeaderQsPanel.setLayoutParams(qqsLP);



        updateBatteryMode();
@@ -550,11 +553,11 @@ public class QuickStatusBarHeader extends FrameLayout implements TunerService.Tu 
        }



        mDatePrivacyView.setPadding(paddingLeft,

                mWaterfallTopInset,

                mStatusBarPaddingTop,

                paddingRight,

                0);

        mStatusIconsView.setPadding(paddingLeft,

                mWaterfallTopInset,

                mStatusBarPaddingTop,

                paddingRight,

                0);

    }