Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I4ae4ad404ff6092f940ab5847dc97c6ae5269a80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Bryce Lee
2023-03-23 19:56:34 +00:00
committed by Automerger Merge Worker
parent 98c6171816 73f4558a36
commit 3725c33f22
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/SystemUI/res/layout/dream_overlay_container.xml
View File

@@ -25,11 +25,12 @@
android:id="@+id/dream_overlay_content" android:id="@+id/dream_overlay_content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginTop="@dimen/dream_overlay_container_margin_top" android:paddingTop="@dimen/dream_overlay_container_padding_top"
android:layout_marginEnd="@dimen/dream_overlay_container_margin_end" android:paddingEnd="@dimen/dream_overlay_container_padding_end"
android:layout_marginBottom="@dimen/dream_overlay_container_margin_bottom" android:paddingBottom="@dimen/dream_overlay_container_padding_bottom"
android:layout_marginStart="@dimen/dream_overlay_container_margin_start" 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_constraintTop_toBottomOf="@id/dream_overlay_status_bar"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
/> />

10
packages/SystemUI/res/values/dimens.xml
View File

@@ -1632,11 +1632,11 @@
.2 .2
</item> </item>
<!-- The margins applied to the dream overlay container --> <!-- The padding applied to the dream overlay container -->
<dimen name="dream_overlay_container_margin_start">0dp</dimen> <dimen name="dream_overlay_container_padding_start">0dp</dimen>
<dimen name="dream_overlay_container_margin_end">0dp</dimen> <dimen name="dream_overlay_container_padding_end">0dp</dimen>
<dimen name="dream_overlay_container_margin_top">0dp</dimen> <dimen name="dream_overlay_container_padding_top">0dp</dimen>
<dimen name="dream_overlay_container_margin_bottom">0dp</dimen> <dimen name="dream_overlay_container_padding_bottom">0dp</dimen>
<!-- The margin applied between complications --> <!-- The margin applied between complications -->
<dimen name="dream_overlay_complication_margin">0dp</dimen> <dimen name="dream_overlay_complication_margin">0dp</dimen>