Merge "Always update status bar window height on config change events" into main (263343bf) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -132,11 +132,11 @@ public class PhoneStatusBarView extends FrameLayout {
		if (updateDisplayParameters()) {
		updateLayoutForCutout();
		requestLayout();
		}
		if (truncatedStatusBarIconsFix()) {
		updateWindowHeight();
		}
		}
		}

		void onDensityOrFontScaleChanged() {
		mClock.onDensityOrFontScaleChanged();

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/PhoneStatusBarViewTest.kt

+25 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,7 @@ import org.junit.Before
		import org.junit.Test
		import org.mockito.Mockito.never
		import org.mockito.Mockito.spy
		import org.mockito.Mockito.times
		import org.mockito.Mockito.verify

		@SmallTest
		@@ -144,6 +145,18 @@ class PhoneStatusBarViewTest : SysuiTestCase() {
		verify(windowController).refreshStatusBarHeight()
		}

		@Test
		fun onConfigurationChanged_multipleCalls_flagEnabled_updatesWindowHeightMultipleTimes() {
		mSetFlagsRule.enableFlags(Flags.FLAG_TRUNCATED_STATUS_BAR_ICONS_FIX)

		view.onConfigurationChanged(Configuration())
		view.onConfigurationChanged(Configuration())
		view.onConfigurationChanged(Configuration())
		view.onConfigurationChanged(Configuration())

		verify(windowController, times(4)).refreshStatusBarHeight()
		}

		@Test
		fun onConfigurationChanged_flagDisabled_doesNotUpdateWindowHeight() {
		mSetFlagsRule.disableFlags(Flags.FLAG_TRUNCATED_STATUS_BAR_ICONS_FIX)
		@@ -153,6 +166,18 @@ class PhoneStatusBarViewTest : SysuiTestCase() {
		verify(windowController, never()).refreshStatusBarHeight()
		}

		@Test
		fun onConfigurationChanged_multipleCalls_flagDisabled_doesNotUpdateWindowHeight() {
		mSetFlagsRule.disableFlags(Flags.FLAG_TRUNCATED_STATUS_BAR_ICONS_FIX)

		view.onConfigurationChanged(Configuration())
		view.onConfigurationChanged(Configuration())
		view.onConfigurationChanged(Configuration())
		view.onConfigurationChanged(Configuration())

		verify(windowController, never()).refreshStatusBarHeight()
		}

		@Test
		fun onAttachedToWindow_updatesLeftTopRightPaddingsBasedOnInsets() {
		val insets = Insets.of(/* left = / 10, / top = / 20, / right = / 30, / bottom = */ 40)