Merge "Clean up launched bug fix flag "truncated_status_bar_icons_fix"" into main (f3c2f400) · Commits · e / os / android_frameworks_base

packages/SystemUI/aconfig/systemui.aconfig

+0 −11

Original line number	Diff line number	Diff line
		@@ -351,17 +351,6 @@ flag {
		bug: "308676488"
		}

		flag {
		name: "truncated_status_bar_icons_fix"
		namespace: "systemui"
		description: "Fixes the status bar icons being trunacted due to the status bar window height "
		"not being updated after certain rotations"
		bug: "323299264"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "status_bar_monochrome_icons_fix"
		namespace: "systemui"

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

+0 −6

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@ import static com.android.systemui.Dependency.TIME_TICK_HANDLER_NAME;
		import static com.android.systemui.Flags.keyboardShortcutHelperRewrite;
		import static com.android.systemui.Flags.lightRevealMigration;
		import static com.android.systemui.Flags.newAodTransition;
		import static com.android.systemui.Flags.truncatedStatusBarIconsFix;
		import static com.android.systemui.charging.WirelessChargingAnimation.UNKNOWN_BATTERY_LEVEL;
		import static com.android.systemui.flags.Flags.SHORTCUT_LIST_SEARCH_LAYOUT;
		import static com.android.systemui.statusbar.NotificationLockscreenUserManager.PERMISSION_SELF;
		@@ -1933,11 +1932,6 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces {
		mQSPanelController.updateResources();
		}

		if (!truncatedStatusBarIconsFix()) {
		if (mStatusBarWindowController != null) {
		mStatusBarWindowController.refreshStatusBarHeight();
		}
		}
		if (mShadeSurface != null) {
		mShadeSurface.updateResources();
		}

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

+2 −7

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package com.android.systemui.statusbar.phone;


		import static com.android.systemui.Flags.truncatedStatusBarIconsFix;

		import android.annotation.Nullable;
		import android.content.Context;
		@@ -108,11 +107,9 @@ public class PhoneStatusBarView extends FrameLayout {
		Dependency.get(DarkIconDispatcher.class).addDarkReceiver(mClock);
		if (updateDisplayParameters()) {
		updateLayoutForCutout();
		if (truncatedStatusBarIconsFix()) {
		updateWindowHeight();
		}
		}
		}

		@Override
		protected void onDetachedFromWindow() {
		@@ -135,10 +132,8 @@ public class PhoneStatusBarView extends FrameLayout {
		updateLayoutForCutout();
		requestLayout();
		}
		if (truncatedStatusBarIconsFix()) {
		updateWindowHeight();
		}
		}

		void onDensityOrFontScaleChanged() {
		mClock.onDensityOrFontScaleChanged();

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesImplTest.java

+1 −10

Original line number	Diff line number	Diff line
		@@ -1157,21 +1157,12 @@ public class CentralSurfacesImplTest extends SysuiTestCase {
		}

		@Test
		@EnableFlags(com.android.systemui.Flags.FLAG_TRUNCATED_STATUS_BAR_ICONS_FIX)
		public void updateResources_flagEnabled_doesNotUpdateStatusBarWindowHeight() {
		public void updateResources_doesNotUpdateStatusBarWindowHeight() {
		mCentralSurfaces.updateResources();

		verify(mStatusBarWindowController, never()).refreshStatusBarHeight();
		}

		@Test
		@DisableFlags(com.android.systemui.Flags.FLAG_TRUNCATED_STATUS_BAR_ICONS_FIX)
		public void updateResources_flagDisabled_updatesStatusBarWindowHeight() {
		mCentralSurfaces.updateResources();

		verify(mStatusBarWindowController).refreshStatusBarHeight();
		}

		@Test
		@EnableSceneContainer
		public void brightnesShowingChanged_flagEnabled_ScrimControllerNotified() {

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

+9 −47

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@ import android.view.View
		import android.view.WindowInsets
		import android.widget.FrameLayout
		import androidx.test.filters.SmallTest
		import com.android.systemui.Flags
		import com.android.systemui.Gefingerpoken
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.plugins.DarkIconDispatcher
		@@ -41,7 +40,6 @@ import com.android.systemui.util.mockito.whenever
		import com.google.common.truth.Truth.assertThat
		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
		@@ -123,36 +121,21 @@ class PhoneStatusBarViewTest : SysuiTestCase() {
		}

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

		fun onAttachedToWindow_updatesWindowHeight() {
		view.onAttachedToWindow()

		verify(windowController).refreshStatusBarHeight()
		}

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

		view.onAttachedToWindow()

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

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

		fun onConfigurationChanged_updatesWindowHeight() {
		view.onConfigurationChanged(Configuration())

		verify(windowController).refreshStatusBarHeight()
		}

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

		fun onConfigurationChanged_multipleCalls_updatesWindowHeightMultipleTimes() {
		view.onConfigurationChanged(Configuration())
		view.onConfigurationChanged(Configuration())
		view.onConfigurationChanged(Configuration())
		@@ -161,27 +144,6 @@ class PhoneStatusBarViewTest : SysuiTestCase() {
		verify(windowController, times(4)).refreshStatusBarHeight()
		}

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

		view.onConfigurationChanged(Configuration())

		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)