Merge changes Idc93ad72,Icdc87c7c into main (8548ab0d) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+0 −4

Original line number	Diff line number	Diff line
		@@ -585,10 +585,6 @@ object Flags {
		@JvmField
		val SHARE_WIFI_QS_BUTTON = releasedFlag("share_wifi_qs_button")

		// TODO(b/287205379): Tracking bug
		@JvmField
		val QS_CONTAINER_GRAPH_OPTIMIZER = releasedFlag( "qs_container_graph_optimizer")

		/** Enable showing a dialog when clicking on Quick Settings bluetooth tile. */
		@JvmField
		val BLUETOOTH_QS_TILE_DIALOG = releasedFlag("bluetooth_qs_tile_dialog")

packages/SystemUI/src/com/android/systemui/shade/NotificationsQSContainerController.kt

+11 −17

Original line number	Diff line number	Diff line
		@@ -30,8 +30,6 @@ import androidx.lifecycle.lifecycleScope
		import com.android.systemui.Flags.centralizedStatusBarDimensRefactor
		import com.android.systemui.dagger.SysUISingleton
		import com.android.systemui.dagger.qualifiers.Main
		import com.android.systemui.flags.FeatureFlags
		import com.android.systemui.flags.Flags
		import com.android.systemui.fragments.FragmentService
		import com.android.systemui.keyguard.shared.KeyguardShadeMigrationNssl
		import com.android.systemui.lifecycle.repeatWhenAttached
		@@ -66,7 +64,6 @@ class NotificationsQSContainerController @Inject constructor(
		private val shadeInteractor: ShadeInteractor,
		private val fragmentService: FragmentService,
		@Main private val delayableExecutor: DelayableExecutor,
		private val featureFlags: FeatureFlags,
		private val
		notificationStackScrollLayoutController: NotificationStackScrollLayoutController,
		private val splitShadeStateController: SplitShadeStateController,
		@@ -133,9 +130,6 @@ class NotificationsQSContainerController @Inject constructor(
		isGestureNavigation = QuickStepContract.isGesturalMode(currentMode)

		mView.setStackScroller(notificationStackScrollLayoutController.getView())
		if (featureFlags.isEnabled(Flags.QS_CONTAINER_GRAPH_OPTIMIZER)){
		mView.enableGraphOptimization()
		}
		}

		public override fun onViewAttached() {

packages/SystemUI/src/com/android/systemui/shade/NotificationsQuickSettingsContainer.java

+3 −6

Original line number	Diff line number	Diff line
		@@ -32,10 +32,10 @@ import androidx.annotation.Nullable;
		import androidx.constraintlayout.widget.ConstraintLayout;
		import androidx.constraintlayout.widget.ConstraintSet;

		import com.android.systemui.keyguard.shared.KeyguardShadeMigrationNssl;
		import com.android.systemui.res.R;
		import com.android.systemui.fragments.FragmentHostManager.FragmentListener;
		import com.android.systemui.keyguard.shared.KeyguardShadeMigrationNssl;
		import com.android.systemui.plugins.qs.QS;
		import com.android.systemui.res.R;
		import com.android.systemui.statusbar.notification.AboveShelfObserver;

		import java.util.ArrayList;
		@@ -73,6 +73,7 @@ public class NotificationsQuickSettingsContainer extends ConstraintLayout

		public NotificationsQuickSettingsContainer(Context context, AttributeSet attrs) {
		super(context, attrs);
		setOptimizationLevel(getOptimizationLevel() \| OPTIMIZATION_GRAPH);
		}

		@Override
		@@ -180,10 +181,6 @@ public class NotificationsQuickSettingsContainer extends ConstraintLayout
		super.dispatchDraw(canvas);
		}

		void enableGraphOptimization() {
		setOptimizationLevel(getOptimizationLevel() \| OPTIMIZATION_GRAPH);
		}

		@Override
		public boolean dispatchTouchEvent(MotionEvent ev) {
		return TouchLogger.logDispatchTouch("NotificationsQuickSettingsContainer", ev,

packages/SystemUI/tests/src/com/android/systemui/shade/NotificationsQSContainerControllerLegacyTest.kt

+0 −6

Original line number	Diff line number	Diff line
		@@ -28,8 +28,6 @@ import androidx.constraintlayout.widget.ConstraintSet
		import androidx.test.filters.SmallTest
		import com.android.systemui.Flags.FLAG_CENTRALIZED_STATUS_BAR_DIMENS_REFACTOR
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.flags.FakeFeatureFlags
		import com.android.systemui.flags.Flags
		import com.android.systemui.fragments.FragmentHostManager
		import com.android.systemui.fragments.FragmentService
		import com.android.systemui.navigationbar.NavigationModeController
		@@ -94,7 +92,6 @@ class NotificationsQSContainerControllerLegacyTest : SysuiTestCase() {

		lateinit var underTest: NotificationsQSContainerController

		private lateinit var featureFlags: FakeFeatureFlags
		private lateinit var navigationModeCallback: ModeChangedListener
		private lateinit var taskbarVisibilityCallback: OverviewProxyListener
		private lateinit var windowInsetsCallback: Consumer<WindowInsets>
		@@ -106,7 +103,6 @@ class NotificationsQSContainerControllerLegacyTest : SysuiTestCase() {
		MockitoAnnotations.initMocks(this)
		fakeSystemClock = FakeSystemClock()
		delayableExecutor = FakeExecutor(fakeSystemClock)
		featureFlags = FakeFeatureFlags().apply { set(Flags.QS_CONTAINER_GRAPH_OPTIMIZER, false) }
		mContext.ensureTestableResources()
		whenever(view.context).thenReturn(mContext)
		whenever(view.resources).thenReturn(mContext.resources)
		@@ -123,7 +119,6 @@ class NotificationsQSContainerControllerLegacyTest : SysuiTestCase() {
		shadeInteractor,
		fragmentService,
		delayableExecutor,
		featureFlags,
		notificationStackScrollLayoutController,
		ResourcesSplitShadeStateController(),
		largeScreenHeaderHelperLazy = { largeScreenHeaderHelper }
		@@ -536,7 +531,6 @@ class NotificationsQSContainerControllerLegacyTest : SysuiTestCase() {
		shadeInteractor,
		fragmentService,
		delayableExecutor,
		featureFlags,
		notificationStackScrollLayoutController,
		ResourcesSplitShadeStateController(),
		largeScreenHeaderHelperLazy = { largeScreenHeaderHelper }

packages/SystemUI/tests/src/com/android/systemui/shade/NotificationsQSContainerControllerTest.kt

+0 −6

Original line number	Diff line number	Diff line
		@@ -28,8 +28,6 @@ import androidx.constraintlayout.widget.ConstraintSet
		import androidx.test.filters.SmallTest
		import com.android.systemui.Flags.FLAG_CENTRALIZED_STATUS_BAR_DIMENS_REFACTOR
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.flags.FakeFeatureFlags
		import com.android.systemui.flags.Flags
		import com.android.systemui.fragments.FragmentHostManager
		import com.android.systemui.fragments.FragmentService
		import com.android.systemui.keyguard.shared.KeyguardShadeMigrationNssl
		@@ -91,7 +89,6 @@ class NotificationsQSContainerControllerTest : SysuiTestCase() {

		lateinit var underTest: NotificationsQSContainerController

		private lateinit var featureFlags: FakeFeatureFlags
		private lateinit var navigationModeCallback: ModeChangedListener
		private lateinit var taskbarVisibilityCallback: OverviewProxyListener
		private lateinit var windowInsetsCallback: Consumer<WindowInsets>
		@@ -104,7 +101,6 @@ class NotificationsQSContainerControllerTest : SysuiTestCase() {
		fakeSystemClock = FakeSystemClock()
		delayableExecutor = FakeExecutor(fakeSystemClock)
		mSetFlagsRule.enableFlags(KeyguardShadeMigrationNssl.FLAG_NAME)
		featureFlags = FakeFeatureFlags().apply { set(Flags.QS_CONTAINER_GRAPH_OPTIMIZER, true) }
		mContext.ensureTestableResources()
		whenever(view.context).thenReturn(mContext)
		whenever(view.resources).thenReturn(mContext.resources)
		@@ -122,7 +118,6 @@ class NotificationsQSContainerControllerTest : SysuiTestCase() {
		shadeInteractor,
		fragmentService,
		delayableExecutor,
		featureFlags,
		notificationStackScrollLayoutController,
		ResourcesSplitShadeStateController(),
		largeScreenHeaderHelperLazy = { largeScreenHeaderHelper }
		@@ -513,7 +508,6 @@ class NotificationsQSContainerControllerTest : SysuiTestCase() {
		shadeInteractor,
		fragmentService,
		delayableExecutor,
		featureFlags,
		notificationStackScrollLayoutController,
		ResourcesSplitShadeStateController(),
		largeScreenHeaderHelperLazy = { largeScreenHeaderHelper }