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

Commit 3725c33f authored by Bryce Lee's avatar Bryce Lee Committed by Automerger Merge Worker
Browse files

Merge "Use padding instead of margins for DreamOverlay." into tm-qpr-dev am: 73f4558a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22189898



Change-Id: I4ae4ad404ff6092f940ab5847dc97c6ae5269a80
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 98c61718 73f4558a

packages/SystemUI/res/layout/dream_overlay_container.xml

+6 −5
Original line number Diff line number Diff line
@@ -25,11 +25,12 @@ 
        android:id="@+id/dream_overlay_content"

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_marginTop="@dimen/dream_overlay_container_margin_top"

        android:layout_marginEnd="@dimen/dream_overlay_container_margin_end"

        android:layout_marginBottom="@dimen/dream_overlay_container_margin_bottom"

        android:layout_marginStart="@dimen/dream_overlay_container_margin_start"



        android:paddingTop="@dimen/dream_overlay_container_padding_top"

        android:paddingEnd="@dimen/dream_overlay_container_padding_end"

        android:paddingBottom="@dimen/dream_overlay_container_padding_bottom"

        android:paddingStart="@dimen/dream_overlay_container_padding_start"

        android:clipToPadding="false"

        android:clipChildren="false"

        app:layout_constraintTop_toBottomOf="@id/dream_overlay_status_bar"

        app:layout_constraintBottom_toBottomOf="parent"

        />

packages/SystemUI/res/values/dimens.xml

+5 −5
Original line number Diff line number Diff line
@@ -1632,11 +1632,11 @@ 
        .2

    </item>



    <!-- The margins applied to the dream overlay container -->

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

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

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

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

    <!-- The padding applied to the dream overlay container -->

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

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

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

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



    <!-- The margin applied between complications -->

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