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

Commit 7e0cac0d authored by Ibrahim Yilmaz's avatar Ibrahim Yilmaz
Browse files

Clean GRAPH_OPTIMIZER FLAG 

Bug: 287205379
Test: presubmit
Flag: None
Change-Id: Icdc87c7c13699871772cec1cd70cd0f52d801930
parent 703fd3da

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

+0 −4
Original line number Original line Diff line number Diff line
@@ -585,10 +585,6 @@ object Flags { 
    @JvmField

    @JvmField

    val SHARE_WIFI_QS_BUTTON = releasedFlag("share_wifi_qs_button")

    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. */

    /** Enable showing a dialog when clicking on Quick Settings bluetooth tile. */

    @JvmField

    @JvmField

    val BLUETOOTH_QS_TILE_DIALOG = releasedFlag("bluetooth_qs_tile_dialog")

    val BLUETOOTH_QS_TILE_DIALOG = releasedFlag("bluetooth_qs_tile_dialog")

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

+12 −17
Original line number Original line Diff line number Diff line
@@ -30,8 +30,6 @@ import androidx.lifecycle.lifecycleScope 
import com.android.systemui.Flags.centralizedStatusBarDimensRefactor

import com.android.systemui.Flags.centralizedStatusBarDimensRefactor

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Main

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.fragments.FragmentService

import com.android.systemui.keyguard.shared.KeyguardShadeMigrationNssl

import com.android.systemui.keyguard.shared.KeyguardShadeMigrationNssl

import com.android.systemui.lifecycle.repeatWhenAttached

import com.android.systemui.lifecycle.repeatWhenAttached
@@ -66,7 +64,6 @@ class NotificationsQSContainerController @Inject constructor( 
    private val shadeInteractor: ShadeInteractor,

    private val shadeInteractor: ShadeInteractor,

    private val fragmentService: FragmentService,

    private val fragmentService: FragmentService,

    @Main private val delayableExecutor: DelayableExecutor,

    @Main private val delayableExecutor: DelayableExecutor,

        private val featureFlags: FeatureFlags,

    private val

    private val

    notificationStackScrollLayoutController: NotificationStackScrollLayoutController,

    notificationStackScrollLayoutController: NotificationStackScrollLayoutController,

    private val splitShadeStateController: SplitShadeStateController,

    private val splitShadeStateController: SplitShadeStateController,
@@ -133,10 +130,8 @@ class NotificationsQSContainerController @Inject constructor( 
        isGestureNavigation = QuickStepContract.isGesturalMode(currentMode)

        isGestureNavigation = QuickStepContract.isGesturalMode(currentMode)





        mView.setStackScroller(notificationStackScrollLayoutController.getView())

        mView.setStackScroller(notificationStackScrollLayoutController.getView())

        if (featureFlags.isEnabled(Flags.QS_CONTAINER_GRAPH_OPTIMIZER)){

        mView.enableGraphOptimization()

        mView.enableGraphOptimization()

    }

    }

    }





    public override fun onViewAttached() {

    public override fun onViewAttached() {

        updateResources()

        updateResources()

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

+0 −6
Original line number Original line Diff line number Diff line
@@ -28,8 +28,6 @@ import androidx.constraintlayout.widget.ConstraintSet 
import androidx.test.filters.SmallTest

import androidx.test.filters.SmallTest

import com.android.systemui.Flags.FLAG_CENTRALIZED_STATUS_BAR_DIMENS_REFACTOR

import com.android.systemui.Flags.FLAG_CENTRALIZED_STATUS_BAR_DIMENS_REFACTOR

import com.android.systemui.SysuiTestCase

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.FragmentHostManager

import com.android.systemui.fragments.FragmentService

import com.android.systemui.fragments.FragmentService

import com.android.systemui.navigationbar.NavigationModeController

import com.android.systemui.navigationbar.NavigationModeController
@@ -94,7 +92,6 @@ class NotificationsQSContainerControllerLegacyTest : SysuiTestCase() { 




    lateinit var underTest: NotificationsQSContainerController

    lateinit var underTest: NotificationsQSContainerController





    private lateinit var featureFlags: FakeFeatureFlags

    private lateinit var navigationModeCallback: ModeChangedListener

    private lateinit var navigationModeCallback: ModeChangedListener

    private lateinit var taskbarVisibilityCallback: OverviewProxyListener

    private lateinit var taskbarVisibilityCallback: OverviewProxyListener

    private lateinit var windowInsetsCallback: Consumer<WindowInsets>

    private lateinit var windowInsetsCallback: Consumer<WindowInsets>
@@ -106,7 +103,6 @@ class NotificationsQSContainerControllerLegacyTest : SysuiTestCase() { 
        MockitoAnnotations.initMocks(this)

        MockitoAnnotations.initMocks(this)

        fakeSystemClock = FakeSystemClock()

        fakeSystemClock = FakeSystemClock()

        delayableExecutor = FakeExecutor(fakeSystemClock)

        delayableExecutor = FakeExecutor(fakeSystemClock)

        featureFlags = FakeFeatureFlags().apply { set(Flags.QS_CONTAINER_GRAPH_OPTIMIZER, false) }

        mContext.ensureTestableResources()

        mContext.ensureTestableResources()

        whenever(view.context).thenReturn(mContext)

        whenever(view.context).thenReturn(mContext)

        whenever(view.resources).thenReturn(mContext.resources)

        whenever(view.resources).thenReturn(mContext.resources)
@@ -123,7 +119,6 @@ class NotificationsQSContainerControllerLegacyTest : SysuiTestCase() { 
                shadeInteractor,

                shadeInteractor,

                fragmentService,

                fragmentService,

                delayableExecutor,

                delayableExecutor,

                featureFlags,

                notificationStackScrollLayoutController,

                notificationStackScrollLayoutController,

                ResourcesSplitShadeStateController(),

                ResourcesSplitShadeStateController(),

                largeScreenHeaderHelperLazy = { largeScreenHeaderHelper }

                largeScreenHeaderHelperLazy = { largeScreenHeaderHelper }
@@ -536,7 +531,6 @@ class NotificationsQSContainerControllerLegacyTest : SysuiTestCase() { 
                shadeInteractor,

                shadeInteractor,

                fragmentService,

                fragmentService,

                delayableExecutor,

                delayableExecutor,

                featureFlags,

                notificationStackScrollLayoutController,

                notificationStackScrollLayoutController,

                ResourcesSplitShadeStateController(),

                ResourcesSplitShadeStateController(),

                largeScreenHeaderHelperLazy = { largeScreenHeaderHelper }

                largeScreenHeaderHelperLazy = { largeScreenHeaderHelper }

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

+0 −6
Original line number Original line Diff line number Diff line
@@ -28,8 +28,6 @@ import androidx.constraintlayout.widget.ConstraintSet 
import androidx.test.filters.SmallTest

import androidx.test.filters.SmallTest

import com.android.systemui.Flags.FLAG_CENTRALIZED_STATUS_BAR_DIMENS_REFACTOR

import com.android.systemui.Flags.FLAG_CENTRALIZED_STATUS_BAR_DIMENS_REFACTOR

import com.android.systemui.SysuiTestCase

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.FragmentHostManager

import com.android.systemui.fragments.FragmentService

import com.android.systemui.fragments.FragmentService

import com.android.systemui.keyguard.shared.KeyguardShadeMigrationNssl

import com.android.systemui.keyguard.shared.KeyguardShadeMigrationNssl
@@ -91,7 +89,6 @@ class NotificationsQSContainerControllerTest : SysuiTestCase() { 




    lateinit var underTest: NotificationsQSContainerController

    lateinit var underTest: NotificationsQSContainerController





    private lateinit var featureFlags: FakeFeatureFlags

    private lateinit var navigationModeCallback: ModeChangedListener

    private lateinit var navigationModeCallback: ModeChangedListener

    private lateinit var taskbarVisibilityCallback: OverviewProxyListener

    private lateinit var taskbarVisibilityCallback: OverviewProxyListener

    private lateinit var windowInsetsCallback: Consumer<WindowInsets>

    private lateinit var windowInsetsCallback: Consumer<WindowInsets>
@@ -104,7 +101,6 @@ class NotificationsQSContainerControllerTest : SysuiTestCase() { 
        fakeSystemClock = FakeSystemClock()

        fakeSystemClock = FakeSystemClock()

        delayableExecutor = FakeExecutor(fakeSystemClock)

        delayableExecutor = FakeExecutor(fakeSystemClock)

        mSetFlagsRule.enableFlags(KeyguardShadeMigrationNssl.FLAG_NAME)

        mSetFlagsRule.enableFlags(KeyguardShadeMigrationNssl.FLAG_NAME)

        featureFlags = FakeFeatureFlags().apply { set(Flags.QS_CONTAINER_GRAPH_OPTIMIZER, true) }

        mContext.ensureTestableResources()

        mContext.ensureTestableResources()

        whenever(view.context).thenReturn(mContext)

        whenever(view.context).thenReturn(mContext)

        whenever(view.resources).thenReturn(mContext.resources)

        whenever(view.resources).thenReturn(mContext.resources)
@@ -122,7 +118,6 @@ class NotificationsQSContainerControllerTest : SysuiTestCase() { 
                shadeInteractor,

                shadeInteractor,

                fragmentService,

                fragmentService,

                delayableExecutor,

                delayableExecutor,

                featureFlags,

                notificationStackScrollLayoutController,

                notificationStackScrollLayoutController,

                ResourcesSplitShadeStateController(),

                ResourcesSplitShadeStateController(),

                largeScreenHeaderHelperLazy = { largeScreenHeaderHelper }

                largeScreenHeaderHelperLazy = { largeScreenHeaderHelper }
@@ -513,7 +508,6 @@ class NotificationsQSContainerControllerTest : SysuiTestCase() { 
                shadeInteractor,

                shadeInteractor,

                fragmentService,

                fragmentService,

                delayableExecutor,

                delayableExecutor,

                featureFlags,

                notificationStackScrollLayoutController,

                notificationStackScrollLayoutController,

                ResourcesSplitShadeStateController(),

                ResourcesSplitShadeStateController(),

                largeScreenHeaderHelperLazy = { largeScreenHeaderHelper }

                largeScreenHeaderHelperLazy = { largeScreenHeaderHelper }