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

Merge "Move bottom padding from ScrollView to child" into tm-dev am: 8e575eafcf am: 4310d341de am: 13dd953208

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

Change-Id: I477e4a8d7196ca145aa1c7678d54bbc383f76532
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Bart Sears
2022-06-24 22:32:37 +00:00
committed by Automerger Merge Worker
parent a45ea75439 13dd953208
commit 2e56533b94
4 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/qs/QSContainerImpl.java
View File

@@ -139,12 +139,11 @@ public class QSContainerImpl extends FrameLayout implements Dumpable {
void updateResources(QSPanelController qsPanelController, void updateResources(QSPanelController qsPanelController,
QuickStatusBarHeaderController quickStatusBarHeaderController) { QuickStatusBarHeaderController quickStatusBarHeaderController) {
int bottomPadding = getResources().getDimensionPixelSize(R.dimen.qs_panel_padding_bottom);
mQSPanelContainer.setPaddingRelative( mQSPanelContainer.setPaddingRelative(
mQSPanelContainer.getPaddingStart(), mQSPanelContainer.getPaddingStart(),
QSUtils.getQsHeaderSystemIconsAreaHeight(mContext), QSUtils.getQsHeaderSystemIconsAreaHeight(mContext),
mQSPanelContainer.getPaddingEnd(), mQSPanelContainer.getPaddingEnd(),
bottomPadding); mQSPanelContainer.getPaddingBottom());
int horizontalMargins = getResources().getDimensionPixelSize(R.dimen.qs_horizontal_margin); int horizontalMargins = getResources().getDimensionPixelSize(R.dimen.qs_horizontal_margin);
int horizontalPadding = getResources().getDimensionPixelSize( int horizontalPadding = getResources().getDimensionPixelSize(

4
packages/SystemUI/src/com/android/systemui/qs/QSPanel.java
View File

@@ -362,11 +362,11 @@ public class QSPanel extends LinearLayout implements Tunable {
protected void updatePadding() { protected void updatePadding() {
final Resources res = mContext.getResources(); final Resources res = mContext.getResources();
int paddingTop = res.getDimensionPixelSize(R.dimen.qs_panel_padding_top); int paddingTop = res.getDimensionPixelSize(R.dimen.qs_panel_padding_top);
// Bottom padding only when there's a new footer with its height. int paddingBottom = res.getDimensionPixelSize(R.dimen.qs_panel_padding_bottom);
setPaddingRelative(getPaddingStart(), setPaddingRelative(getPaddingStart(),
paddingTop, paddingTop,
getPaddingEnd(), getPaddingEnd(),
getPaddingBottom()); paddingBottom);
} }
void addOnConfigurationChangedListener(OnConfigurationChangedListener listener) { void addOnConfigurationChangedListener(OnConfigurationChangedListener listener) {

3
packages/SystemUI/tests/src/com/android/systemui/qs/QSContainerImplTest.kt
View File

@@ -57,6 +57,7 @@ class QSContainerImplTest : SysuiTestCase() {
@Test @Test
fun testContainerBottomPadding() { fun testContainerBottomPadding() {
val originalPadding = qsPanelContainer.paddingBottom
qsContainer.updateResources( qsContainer.updateResources(
qsPanelController, qsPanelController,
quickStatusBarHeaderController quickStatusBarHeaderController
@@ -66,7 +67,7 @@ class QSContainerImplTest : SysuiTestCase() {
anyInt(), anyInt(),
anyInt(), anyInt(),
anyInt(), anyInt(),
eq(mContext.resources.getDimensionPixelSize(R.dimen.footer_actions_height)) eq(originalPadding)
) )
} }
} }

8
packages/SystemUI/tests/src/com/android/systemui/qs/QSPanelTest.kt
View File

@@ -150,6 +150,14 @@ class QSPanelTest : SysuiTestCase() {
assertThat(footer.isVisibleToUser).isTrue() assertThat(footer.isVisibleToUser).isTrue()
} }
@Test
fun testBottomPadding() {
val padding = 10
context.orCreateTestableResources.addOverride(R.dimen.qs_panel_padding_bottom, padding)
qsPanel.updatePadding()
assertThat(qsPanel.paddingBottom).isEqualTo(padding)
}
private infix fun View.isLeftOf(other: View): Boolean { private infix fun View.isLeftOf(other: View): Boolean {
val rect = Rect() val rect = Rect()
getBoundsOnScreen(rect) getBoundsOnScreen(rect)