Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ecabcaf9 authored Jun 24, 2022 by Bart Sears Committed by Automerger Merge Worker Jun 24, 2022

Merge "Move bottom padding from ScrollView to child" into tm-dev am: 8e575eaf

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

Change-Id: Ic66e2ac9b6fdd2fdd8d3c4e742a31932a2c6abf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 8fe035db 8e575eaf

packages/SystemUI/src/com/android/systemui/qs/QSContainerImpl.java

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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(

packages/SystemUI/src/com/android/systemui/qs/QSPanel.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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) {

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

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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)
	)		)
	}		}
	}		}
			No newline at end of file

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

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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)