summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Bryce Lee <brycelee@google.com> 2023-03-21 16:56:16 -0700
committer Bryce Lee <brycelee@google.com> 2023-03-21 17:34:12 -0700
commiteb96fa292fe36269c864d255b68219c8746eea97 (patch)
tree03bb94ca73c64390f5e2a1552423c5986db2536a
parent614f8384db4d5fa9cd275465a4c59c4a86f0780f (diff)
Use padding instead of margins for DreamOverlay.
This changelist changes the DreamOverlayContainer to use padding instead of margins to allow for animations within the spacing. Test: manual Bug: 274627474 Change-Id: I42e1054c4b1d7f328f58ae3bd83d8f211ed1da8e
-rw-r--r--packages/SystemUI/res/layout/dream_overlay_container.xml11
-rw-r--r--packages/SystemUI/res/values/dimens.xml10
2 files changed, 11 insertions, 10 deletions
diff --git a/packages/SystemUI/res/layout/dream_overlay_container.xml b/packages/SystemUI/res/layout/dream_overlay_container.xml
index 8e83b4abe0dc..ae0a9374fd2c 100644
--- a/packages/SystemUI/res/layout/dream_overlay_container.xml
+++ b/packages/SystemUI/res/layout/dream_overlay_container.xml
@@ -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"
/>
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index 89857f120396..91459825f5e0 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -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>