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

Commit 5c0c91dd authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Rename ShadePositionRepository to ShadeDisplaysRepository" into main

parents c26e8ed6 70c61b6e

packages/SystemUI/multivalentTests/src/com/android/keyguard/KeyguardDisplayManagerTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import com.android.systemui.Flags 
import com.android.systemui.SysuiTestCase

import com.android.systemui.navigationbar.NavigationBarController

import com.android.systemui.settings.FakeDisplayTracker

import com.android.systemui.shade.data.repository.FakeShadePositionRepository

import com.android.systemui.shade.data.repository.FakeShadeDisplayRepository

import com.android.systemui.statusbar.policy.KeyguardStateController

import java.util.concurrent.Executor

import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -62,7 +62,7 @@ class KeyguardDisplayManagerTest : SysuiTestCase() { 
        mock(ConnectedDisplayKeyguardPresentation::class.java)

    @Mock private val deviceStateHelper = mock(DeviceStateHelper::class.java)

    @Mock private val keyguardStateController = mock(KeyguardStateController::class.java)

    private val shadePositionRepository = FakeShadePositionRepository()

    private val shadePositionRepository = FakeShadeDisplayRepository()



    private val mainExecutor = Executor { it.run() }

    private val backgroundExecutor = Executor { it.run() }

packages/SystemUI/multivalentTests/src/com/android/systemui/shade/data/repository/ShadePositionRepositoryTest.kt→packages/SystemUI/multivalentTests/src/com/android/systemui/shade/data/repository/ShadeDisplaysRepositoryTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -34,13 +34,13 @@ import org.junit.runner.RunWith 


@SmallTest

@RunWith(AndroidJUnit4::class)

class ShadePositionRepositoryTest : SysuiTestCase() {

class ShadeDisplaysRepositoryTest : SysuiTestCase() {

    private val kosmos = testKosmos()

    private val testScope = kosmos.testScope

    private val commandRegistry = kosmos.commandRegistry

    private val pw = PrintWriter(StringWriter())



    private val underTest = ShadePositionRepositoryImpl(commandRegistry)

    private val underTest = ShadeDisplaysRepositoryImpl(commandRegistry)



    @Before

    fun setUp() {

packages/SystemUI/multivalentTests/src/com/android/systemui/shade/domain/interactor/ShadeDisplaysInteractorTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import com.android.systemui.SysuiTestCase 
import com.android.systemui.display.data.repository.FakeDisplayWindowPropertiesRepository

import com.android.systemui.display.shared.model.DisplayWindowProperties

import com.android.systemui.scene.ui.view.WindowRootView

import com.android.systemui.shade.data.repository.FakeShadePositionRepository

import com.android.systemui.shade.data.repository.FakeShadeDisplayRepository

import com.android.systemui.statusbar.phone.ConfigurationForwarder

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.test.TestScope
@@ -50,7 +50,7 @@ import org.mockito.kotlin.whenever 
class ShadeDisplaysInteractorTest : SysuiTestCase() {



    private val shadeRootview = mock<WindowRootView>()

    private val positionRepository = FakeShadePositionRepository()

    private val positionRepository = FakeShadeDisplayRepository()

    private val defaultContext = mock<Context>()

    private val secondaryContext = mock<Context>()

    private val contextStore = FakeDisplayWindowPropertiesRepository()

packages/SystemUI/src/com/android/keyguard/KeyguardDisplayManager.java

+3 −3
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ import com.android.systemui.dagger.qualifiers.UiBackground; 
import com.android.systemui.navigationbar.NavigationBarController;

import com.android.systemui.navigationbar.views.NavigationBarView;

import com.android.systemui.settings.DisplayTracker;

import com.android.systemui.shade.data.repository.ShadePositionRepository;

import com.android.systemui.shade.data.repository.ShadeDisplaysRepository;

import com.android.systemui.shade.shared.flag.ShadeWindowGoesAround;

import com.android.systemui.statusbar.policy.KeyguardStateController;
@@ -66,7 +66,7 @@ public class KeyguardDisplayManager { 
    private final DisplayManager mDisplayService;

    private final DisplayTracker mDisplayTracker;

    private final Lazy<NavigationBarController> mNavigationBarControllerLazy;

    private final Provider<ShadePositionRepository> mShadePositionRepositoryProvider;

    private final Provider<ShadeDisplaysRepository> mShadePositionRepositoryProvider;

    private final ConnectedDisplayKeyguardPresentation.Factory

            mConnectedDisplayKeyguardPresentationFactory;

    private final Context mContext;
@@ -112,7 +112,7 @@ public class KeyguardDisplayManager { 
            KeyguardStateController keyguardStateController,

            ConnectedDisplayKeyguardPresentation.Factory

                    connectedDisplayKeyguardPresentationFactory,

            Provider<ShadePositionRepository> shadePositionRepositoryProvider,

            Provider<ShadeDisplaysRepository> shadePositionRepositoryProvider,

            @Application CoroutineScope appScope) {

        mContext = context;

        mNavigationBarControllerLazy = navigationBarControllerLazy;

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

+5 −5
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ import com.android.systemui.common.ui.domain.interactor.ConfigurationInteractor 
import com.android.systemui.common.ui.domain.interactor.ConfigurationInteractorImpl

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.res.R

import com.android.systemui.shade.data.repository.ShadePositionRepository

import com.android.systemui.shade.data.repository.ShadePositionRepositoryImpl

import com.android.systemui.shade.data.repository.ShadeDisplaysRepository

import com.android.systemui.shade.data.repository.ShadeDisplaysRepositoryImpl

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

import com.android.systemui.statusbar.phone.ConfigurationControllerImpl

import com.android.systemui.statusbar.phone.ConfigurationForwarder
@@ -157,16 +157,16 @@ object ShadeDisplayAwareModule { 


    @SysUISingleton

    @Provides

    fun provideShadePositionRepository(impl: ShadePositionRepositoryImpl): ShadePositionRepository {

    fun provideShadePositionRepository(impl: ShadeDisplaysRepositoryImpl): ShadeDisplaysRepository {

        ShadeWindowGoesAround.isUnexpectedlyInLegacyMode()

        return impl

    }



    @Provides

    @IntoMap

    @ClassKey(ShadePositionRepositoryImpl::class)

    @ClassKey(ShadeDisplaysRepositoryImpl::class)

    fun provideShadePositionRepositoryAsCoreStartable(

        impl: ShadePositionRepositoryImpl

        impl: ShadeDisplaysRepositoryImpl

    ): CoreStartable {

        return if (ShadeWindowGoesAround.isEnabled) {

            impl