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

Fix left margin too big on split shade

Browse Source 
Test: Manually
Bug: 223537376
Change-Id: I298761fa0351b9417540f6b4d7dfceab4882a4fd
This commit is contained in:
Christian Göllner
2022-03-09 14:08:44 +01:00
parent f54c03715a
commit 96faf81d62
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
constraintSet.apply {
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, TOP, topMargin)
}

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

@@ -457,6 +457,26 @@ class NotificationQSContainerControllerTest : SysuiTestCase() {
.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
fun testSinglePaneShadeLayout_isAlignedToParent() {
disableSplitShade()