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

Commit df664f71 authored by Bryce Lee's avatar Bryce Lee
Browse files

Define margins for complication overlay. 

This changelist adds margin dimensions for the overall complication layout and the alignment of complications. The latter margins are applied through the ComplicationLayoutEngine.

Bug: 217660360
Test: atest ComplicationLayoutEngineTest#testMargin
Change-Id: I7d0ab36fb33ae78ba51900bfc5393654ab60b3a2
parent eeea7407

packages/SystemUI/res/layout/dream_overlay_complication_clock_date.xml

+0 −2
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ 
    android:id="@+id/date_view"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:paddingLeft="@dimen/dream_overlay_complication_clock_date_padding_left"

    android:paddingBottom="@dimen/dream_overlay_complication_clock_date_padding_bottom"

    android:gravity="center_horizontal"

    android:textColor="@android:color/white"

    android:shadowColor="@color/keyguard_shadow_color"

packages/SystemUI/res/layout/dream_overlay_complication_clock_time.xml

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

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:paddingLeft="@dimen/dream_overlay_complication_clock_time_padding_left"

    android:fontFamily="@font/clock"

    android:textColor="@android:color/white"

    android:format12Hour="h:mm"

packages/SystemUI/res/layout/dream_overlay_complication_weather.xml

+0 −2
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ 
    android:id="@+id/weather_view"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:paddingLeft="@dimen/dream_overlay_complication_weather_padding_left"

    android:paddingBottom="@dimen/dream_overlay_complication_weather_padding_bottom"

    android:textColor="@android:color/white"

    android:shadowColor="@color/keyguard_shadow_color"

    android:shadowRadius="?attr/shadowRadius"

packages/SystemUI/res/layout/dream_overlay_container.xml

+7 −1
Original line number Diff line number Diff line
@@ -25,8 +25,14 @@ 
        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"



        app:layout_constraintTop_toBottomOf="@id/dream_overlay_status_bar"

        app:layout_constraintBottom_toBottomOf="parent" />

        app:layout_constraintBottom_toBottomOf="parent"

        />



    <com.android.systemui.dreams.DreamOverlayStatusBarView

        android:id="@+id/dream_overlay_status_bar"

packages/SystemUI/res/values/dimens.xml

+9 −5
Original line number Diff line number Diff line
@@ -1347,13 +1347,8 @@ 
    <dimen name="dream_overlay_notifications_drag_area_height">100dp</dimen>



    <!-- Dream overlay complications related dimensions -->

    <dimen name="dream_overlay_complication_clock_time_padding_left">50dp</dimen>

    <dimen name="dream_overlay_complication_clock_time_text_size">72sp</dimen>

    <dimen name="dream_overlay_complication_clock_date_padding_left">60dp</dimen>

    <dimen name="dream_overlay_complication_clock_date_padding_bottom">50dp</dimen>

    <dimen name="dream_overlay_complication_clock_date_text_size">18sp</dimen>

    <dimen name="dream_overlay_complication_weather_padding_left">20dp</dimen>

    <dimen name="dream_overlay_complication_weather_padding_bottom">50dp</dimen>

    <dimen name="dream_overlay_complication_weather_text_size">18sp</dimen>



    <!-- The position of the end guide, which dream overlay complications can align their start with
@@ -1388,4 +1383,13 @@ 
    <item name="dream_overlay_bouncer_start_region_screen_percentage" format="float" type="dimen">

        .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 margin applied between complications -->

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

</resources>