Merge "Use padding instead of margins for DreamOverlay." into tm-qpr-dev am: 73f4558a36 am: 3725c33f22
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22189898 Change-Id: I1ca34b8c441edddfb4e3e3b01d7c50d392d16921 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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"
|
||||
/>
|
||||
|
||||
@@ -1670,11 +1670,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>
|
||||
|
||||
Reference in New Issue
Block a user