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

Commit e03e4c9e authored by Fabian Kozynski's avatar Fabian Kozynski
Browse files

Add some padding between QS and shelf 

Also fix margins of QSDetail

Test: manual, with and without media
Bug: 185390072
Change-Id: Ia4367e933319a55c2f62d4ec8b9d6b4532977816
parent 4b537e91

packages/SystemUI/res/layout/qs_detail.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -23,6 +23,7 @@ 
    android:clickable="true"

    android:clickable="true"

    android:orientation="vertical"

    android:orientation="vertical"

    android:layout_marginTop="@*android:dimen/quick_qs_offset_height"

    android:layout_marginTop="@*android:dimen/quick_qs_offset_height"

    android:layout_marginBottom="@dimen/qs_container_bottom_padding"

    android:paddingBottom="8dp"

    android:paddingBottom="8dp"

    android:visibility="invisible"

    android:visibility="invisible"

    android:elevation="4dp"

    android:elevation="4dp"

packages/SystemUI/res/layout/qs_panel.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -32,6 +32,7 @@ 
        android:id="@+id/expanded_qs_scroll_view"

        android:id="@+id/expanded_qs_scroll_view"

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:paddingBottom="@dimen/qs_container_bottom_padding"

        android:elevation="4dp"

        android:elevation="4dp"

        android:importantForAccessibility="no"

        android:importantForAccessibility="no"

        android:scrollbars="none"

        android:scrollbars="none"

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -33,7 +33,7 @@ 
    <dimen name="battery_detail_graph_space_top">9dp</dimen>

    <dimen name="battery_detail_graph_space_top">9dp</dimen>

    <dimen name="battery_detail_graph_space_bottom">9dp</dimen>

    <dimen name="battery_detail_graph_space_bottom">9dp</dimen>





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

    <dimen name="qs_detail_margin_top">14dp</dimen>





    <dimen name="volume_tool_tip_right_margin">136dp</dimen>

    <dimen name="volume_tool_tip_right_margin">136dp</dimen>

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

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

packages/SystemUI/res/values/dimens.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -610,6 +610,8 @@ 




    <dimen name="qs_notif_collapsed_space">64dp</dimen>

    <dimen name="qs_notif_collapsed_space">64dp</dimen>





    <dimen name="qs_container_bottom_padding">24dp</dimen>



    <!-- Desired qs icon overlay size. -->

    <!-- Desired qs icon overlay size. -->

    <dimen name="qs_detail_icon_overlay_size">24dp</dimen>

    <dimen name="qs_detail_icon_overlay_size">24dp</dimen>

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

+8 −0
Original line number Original line Diff line number Diff line
@@ -206,6 +206,12 @@ public class QSContainerImpl extends FrameLayout { 
        layoutParams.topMargin = mContext.getResources().getDimensionPixelSize(

        layoutParams.topMargin = mContext.getResources().getDimensionPixelSize(

                com.android.internal.R.dimen.quick_qs_offset_height);

                com.android.internal.R.dimen.quick_qs_offset_height);

        mQSPanelContainer.setLayoutParams(layoutParams);

        mQSPanelContainer.setLayoutParams(layoutParams);

        mQSPanelContainer.setPaddingRelative(

                mQSPanelContainer.getPaddingStart(),

                mQSPanelContainer.getPaddingTop(),

                mQSPanelContainer.getPaddingEnd(),

                mContext.getResources().getDimensionPixelSize(R.dimen.qs_container_bottom_padding)

        );





        mSideMargins = getResources().getDimensionPixelSize(R.dimen.notification_side_paddings);

        mSideMargins = getResources().getDimensionPixelSize(R.dimen.notification_side_paddings);

        int padding = getResources().getDimensionPixelSize(

        int padding = getResources().getDimensionPixelSize(
@@ -237,6 +243,8 @@ public class QSContainerImpl extends FrameLayout { 
        int scrollBottom = calculateContainerBottom();

        int scrollBottom = calculateContainerBottom();

        setBottom(getTop() + height);

        setBottom(getTop() + height);

        mQSDetail.setBottom(getTop() + scrollBottom);

        mQSDetail.setBottom(getTop() + scrollBottom);

        int qsDetailBottomMargin = ((MarginLayoutParams) mQSDetail.getLayoutParams()).bottomMargin;

        mQSDetail.setBottom(getTop() + scrollBottom - qsDetailBottomMargin);

        mBackground.setTop(mQSPanelContainer.getTop());

        mBackground.setTop(mQSPanelContainer.getTop());

        updateBackgroundBottom(scrollBottom, animate);

        updateBackgroundBottom(scrollBottom, animate);

    }

    }