diff options
5 files changed, 14 insertions, 39 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt index c69c9ef93761..6eff79284847 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt +++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt @@ -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") diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationsQSContainerController.kt b/packages/SystemUI/src/com/android/systemui/shade/NotificationsQSContainerController.kt index 84cad1d16d73..c0afa32571e7 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationsQSContainerController.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationsQSContainerController.kt @@ -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 @@ -59,18 +57,17 @@ internal const val INSET_DEBOUNCE_MILLIS = 500L @SysUISingleton class NotificationsQSContainerController @Inject constructor( - view: NotificationsQuickSettingsContainer, - private val navigationModeController: NavigationModeController, - private val overviewProxyService: OverviewProxyService, - private val shadeHeaderController: ShadeHeaderController, - 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, - private val largeScreenHeaderHelperLazy: Lazy<LargeScreenHeaderHelper>, + view: NotificationsQuickSettingsContainer, + private val navigationModeController: NavigationModeController, + private val overviewProxyService: OverviewProxyService, + private val shadeHeaderController: ShadeHeaderController, + private val shadeInteractor: ShadeInteractor, + private val fragmentService: FragmentService, + @Main private val delayableExecutor: DelayableExecutor, + private val + notificationStackScrollLayoutController: NotificationStackScrollLayoutController, + private val splitShadeStateController: SplitShadeStateController, + private val largeScreenHeaderHelperLazy: Lazy<LargeScreenHeaderHelper>, ) : ViewController<NotificationsQuickSettingsContainer>(view), QSContainerController { private var splitShadeEnabled = false @@ -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() { diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationsQuickSettingsContainer.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationsQuickSettingsContainer.java index de3d16a57a1f..25e558ee42dd 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationsQuickSettingsContainer.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationsQuickSettingsContainer.java @@ -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, diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationsQSContainerControllerLegacyTest.kt b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationsQSContainerControllerLegacyTest.kt index 697b05aa9add..c2261211b339 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationsQSContainerControllerLegacyTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationsQSContainerControllerLegacyTest.kt @@ -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 } diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationsQSContainerControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationsQSContainerControllerTest.kt index e66251a030a3..c32635020ddc 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationsQSContainerControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/shade/NotificationsQSContainerControllerTest.kt @@ -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 } |