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

Commit cad46385 authored by Chris Göllner's avatar Chris Göllner Committed by Android (Google) Code Review
Browse files

Merge changes I2f464b39,Iba887b06,I20fbf998 into main 

* changes:
  Remove flag dependency of `status_bar_connected_displays`
  Fix status bar crashing on connected displays
  Introduce PrivacyDotViewControllerStore for multiple displays
parents a43f755a 3ffd1b29

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/core/StatusBarInitializerTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -98,9 +98,9 @@ class StatusBarInitializerTest : SysuiTestCase() { 


    @Test

    @DisableFlags(Flags.FLAG_STATUS_BAR_SIMPLE_FRAGMENT)

    fun flagOff_doesNotInitializeViaCoreStartable() {

    fun flagOff_startCalled_stillInitializes() {

        underTest.start()

        assertThat(underTest.initialized).isFalse()

        assertThat(underTest.initialized).isTrue()

    }



    @Test

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/core/StatusBarOrchestratorTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ import org.mockito.kotlin.never 
import org.mockito.kotlin.times

import org.mockito.kotlin.verify



@EnableFlags(StatusBarSimpleFragment.FLAG_NAME)

@EnableFlags(StatusBarConnectedDisplays.FLAG_NAME)

@SmallTest

@RunWith(AndroidJUnit4::class)

class StatusBarOrchestratorTest : SysuiTestCase() {

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

+0 −4
Original line number Diff line number Diff line
@@ -34,8 +34,6 @@ import com.android.systemui.dagger.SysUISingleton 
import com.android.systemui.keyguard.MigrateClocksToBlueprint

import com.android.systemui.scene.shared.flag.SceneContainerFlag

import com.android.systemui.shade.shared.flag.DualShade

import com.android.systemui.statusbar.core.StatusBarConnectedDisplays

import com.android.systemui.statusbar.core.StatusBarSimpleFragment

import com.android.systemui.statusbar.notification.collection.SortBySectionTimeFlag

import com.android.systemui.statusbar.notification.emptyshade.shared.ModesEmptyShadeFix

import com.android.systemui.statusbar.notification.footer.shared.FooterViewRefactor
@@ -75,8 +73,6 @@ class FlagDependencies @Inject constructor(featureFlags: FeatureFlagsClassic, ha 
        // Status bar chip dependencies

        statusBarCallChipNotificationIconToken dependsOn statusBarUseReposForCallChipToken

        statusBarCallChipNotificationIconToken dependsOn statusBarScreenSharingChipsToken



        StatusBarConnectedDisplays.token dependsOn StatusBarSimpleFragment.token

    }



    private inline val politeNotifications

packages/SystemUI/src/com/android/systemui/statusbar/core/StatusBarInitializer.kt

+1 −3
Original line number Diff line number Diff line
@@ -103,10 +103,8 @@ constructor( 
        }



    override fun start() {

        if (StatusBarSimpleFragment.isEnabled) {

        doStart()

    }

    }



    override fun initializeStatusBar() {

        StatusBarSimpleFragment.assertInLegacyMode()

packages/SystemUI/src/com/android/systemui/statusbar/core/StatusBarOrchestrator.kt

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ constructor( 
            }



    override fun start() {

        StatusBarSimpleFragment.assertInNewMode()

        StatusBarConnectedDisplays.assertInNewMode()

        coroutineScope

            .launch {

                dumpManager.registerCriticalDumpable(dumpableName, this@StatusBarOrchestrator)