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

Merge "Fix left margin too big on split shade" into tm-dev am: 8507e74ef6

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

Change-Id: I6f70b9d07e6ef8a3ec454e8c886601e3dc8a944f
This commit is contained in:
Christian Göllner
2022-03-10 17:48:57 +00:00
committed by Automerger Merge Worker
parent 5bf39d79ee 8507e74ef6
commit 484b673493
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationsQSContainerController.kt
View File

@@ -234,7 +234,7 @@ class NotificationsQSContainerController @Inject constructor(
val endConstraintId = if (splitShadeEnabled) R.id.qs_edge_guideline else PARENT_ID val endConstraintId = if (splitShadeEnabled) R.id.qs_edge_guideline else PARENT_ID
constraintSet.apply { constraintSet.apply {
connect(R.id.qs_frame, END, endConstraintId, END) connect(R.id.qs_frame, END, endConstraintId, END)
setMargin(R.id.qs_frame, START, panelMarginHorizontal) setMargin(R.id.qs_frame, START, if (splitShadeEnabled) 0 else panelMarginHorizontal)
setMargin(R.id.qs_frame, END, if (splitShadeEnabled) 0 else panelMarginHorizontal) setMargin(R.id.qs_frame, END, if (splitShadeEnabled) 0 else panelMarginHorizontal)
setMargin(R.id.qs_frame, TOP, topMargin) setMargin(R.id.qs_frame, TOP, topMargin)
} }

20
packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationQSContainerControllerTest.kt
View File

@@ -456,6 +456,26 @@ class NotificationQSContainerControllerTest : SysuiTestCase() {
.isEqualTo(0) .isEqualTo(0)
} }
@Test
fun testSplitShadeLayout_qsFrameHasHorizontalMarginsOfZero() {
enableSplitShade()
controller.updateResources()
assertThat(getConstraintSetLayout(R.id.qs_frame).endMargin).isEqualTo(0)
assertThat(getConstraintSetLayout(R.id.qs_frame).startMargin).isEqualTo(0)
}
@Test
fun testSinglePaneShadeLayout_qsFrameHasHorizontalMarginsSetToCorrectValue() {
disableSplitShade()
controller.updateResources()
val notificationPanelMarginHorizontal = context.resources
.getDimensionPixelSize(R.dimen.notification_panel_margin_horizontal)
assertThat(getConstraintSetLayout(R.id.qs_frame).endMargin)
.isEqualTo(notificationPanelMarginHorizontal)
assertThat(getConstraintSetLayout(R.id.qs_frame).startMargin)
.isEqualTo(notificationPanelMarginHorizontal)
}
@Test @Test
fun testSinglePaneShadeLayout_isAlignedToParent() { fun testSinglePaneShadeLayout_isAlignedToParent() {
disableSplitShade() disableSplitShade()