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

Commit c54c959c authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[Battery] Mark battery classes in common/ as deprecated. 

We should instead be using the battery classes in
statusbar/pipeline/battery.

Bug: 434194794
Flag: EXEMPT rename only
Test: atest CommunalAutoOpenInteractorTest
LowLightBehaviorCoreStartableTest

Change-Id: Ibc1f4e835a1f221eaec8a031f95b1af75aa97c28
parent 1f0eccf8

packages/SystemUI/multivalentTests/src/com/android/systemui/communal/domain/interactor/CommunalAutoOpenInteractorTest.kt

+6 −6
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 
import androidx.test.filters.SmallTest

import com.android.systemui.Flags.FLAG_GLANCEABLE_HUB_V2

import com.android.systemui.SysuiTestCase

import com.android.systemui.common.data.repository.batteryRepository

import com.android.systemui.common.data.repository.batteryRepositoryDeprecated

import com.android.systemui.common.data.repository.fake

import com.android.systemui.communal.data.model.FEATURE_AUTO_OPEN

import com.android.systemui.communal.data.model.FEATURE_MANUAL_OPEN
@@ -83,14 +83,14 @@ class CommunalAutoOpenInteractorTest : SysuiTestCase() { 
                MAIN_USER_ID,

            )



            batteryRepository.fake.setDevicePluggedIn(false)

            batteryRepositoryDeprecated.fake.setDevicePluggedIn(false)

            assertThat(shouldAutoOpen).isFalse()

            assertThat(suppressionReason)

                .isEqualTo(

                    SuppressionReason.ReasonWhenToAutoShow(FEATURE_AUTO_OPEN or FEATURE_MANUAL_OPEN)

                )



            batteryRepository.fake.setDevicePluggedIn(true)

            batteryRepositoryDeprecated.fake.setDevicePluggedIn(true)

            assertThat(shouldAutoOpen).isTrue()

            assertThat(suppressionReason).isNull()

        }
@@ -107,7 +107,7 @@ class CommunalAutoOpenInteractorTest : SysuiTestCase() { 
                MAIN_USER_ID,

            )



            batteryRepository.fake.setDevicePluggedIn(true)

            batteryRepositoryDeprecated.fake.setDevicePluggedIn(true)

            fakeDockManager.setIsDocked(false)



            assertThat(shouldAutoOpen).isFalse()
@@ -134,7 +134,7 @@ class CommunalAutoOpenInteractorTest : SysuiTestCase() { 
                MAIN_USER_ID,

            )



            batteryRepository.fake.setDevicePluggedIn(true)

            batteryRepositoryDeprecated.fake.setDevicePluggedIn(true)

            posturingRepository.fake.emitPositionState(

                PositionState(

                    stationary = ConfidenceLevel.Positive(confidence = 1f),
@@ -172,7 +172,7 @@ class CommunalAutoOpenInteractorTest : SysuiTestCase() { 
                MAIN_USER_ID,

            )



            batteryRepository.fake.setDevicePluggedIn(true)

            batteryRepositoryDeprecated.fake.setDevicePluggedIn(true)

            posturingRepository.fake.emitPositionState(PositionState())

            fakeDockManager.setIsDocked(true)

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/FromDreamingTransitionInteractorTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import com.android.systemui.Flags.FLAG_GLANCEABLE_HUB_V2 
import com.android.systemui.Flags.glanceableHubV2

import com.android.systemui.SysuiTestCase

import com.android.systemui.bouncer.data.repository.fakeKeyguardBouncerRepository

import com.android.systemui.common.data.repository.batteryRepository

import com.android.systemui.common.data.repository.batteryRepositoryDeprecated

import com.android.systemui.common.data.repository.fake

import com.android.systemui.communal.data.repository.communalSceneRepository

import com.android.systemui.communal.domain.interactor.setCommunalAvailable
@@ -215,7 +215,7 @@ class FromDreamingTransitionInteractorTest(flags: FlagsParameterization?) : Sysu 
                    1,

                    user.id,

                )

                batteryRepository.fake.setDevicePluggedIn(true)

                batteryRepositoryDeprecated.fake.setDevicePluggedIn(true)

            } else {

                whenever(dreamManager.canStartDreaming(anyBoolean())).thenReturn(true)

            }

packages/SystemUI/multivalentTests/src/com/android/systemui/lowlight/LowLightBehaviorCoreStartableTest.kt

+5 −5
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ import android.provider.Settings 
import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.common.data.repository.batteryRepository

import com.android.systemui.common.data.repository.batteryRepositoryDeprecated

import com.android.systemui.common.data.repository.fake

import com.android.systemui.common.domain.interactor.batteryInteractor

import com.android.systemui.common.domain.interactor.batteryInteractorDeprecated

import com.android.systemui.display.data.repository.displayRepository

import com.android.systemui.display.domain.interactor.displayStateInteractor

import com.android.systemui.dreams.domain.interactor.dreamSettingsInteractorKosmos
@@ -87,7 +87,7 @@ class LowLightBehaviorCoreStartableTest : SysuiTestCase() { 
                lowLightBehaviorShellCommand = lowLightBehaviorShellCommand,

                lowLightShellCommand = lowLightShellCommand,

                scope = backgroundScope,

                batteryInteractor = batteryInteractor,

                batteryInteractorDeprecated = batteryInteractorDeprecated,

            )

        }
@@ -96,7 +96,7 @@ class LowLightBehaviorCoreStartableTest : SysuiTestCase() { 
    }



    private fun Kosmos.setBatteryPluggedIn(pluggedIn: Boolean) {

        batteryRepository.fake.setDevicePluggedIn(pluggedIn)

        batteryRepositoryDeprecated.fake.setDevicePluggedIn(pluggedIn)

    }



    private fun Kosmos.setDreamEnabled(enabled: Boolean) {
@@ -151,7 +151,7 @@ class LowLightBehaviorCoreStartableTest : SysuiTestCase() { 
        }

        kosmos.lowLightRepository.addAction(LowLightDisplayBehavior.LOW_LIGHT_DREAM, action)



        kosmos.batteryRepository.fake.setDevicePluggedIn(true)

        kosmos.batteryRepositoryDeprecated.fake.setDevicePluggedIn(true)

    }



    @Test

packages/SystemUI/src/com/android/systemui/common/data/CommonDataLayerModule.kt

+6 −3
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ package com.android.systemui.common.data 


import com.android.systemui.common.data.datastore.DataStoreWrapperFactory

import com.android.systemui.common.data.datastore.DataStoreWrapperFactoryImpl

import com.android.systemui.common.data.repository.BatteryRepository

import com.android.systemui.common.data.repository.BatteryRepositoryImpl

import com.android.systemui.common.data.repository.BatteryRepositoryDeprecated

import com.android.systemui.common.data.repository.BatteryRepositoryDeprecatedImpl

import com.android.systemui.common.data.repository.PackageChangeRepository

import com.android.systemui.common.data.repository.PackageChangeRepositoryImpl

import dagger.Binds
@@ -32,7 +32,10 @@ abstract class CommonDataLayerModule { 
        impl: PackageChangeRepositoryImpl

    ): PackageChangeRepository



    @Binds abstract fun bindBatteryRepository(impl: BatteryRepositoryImpl): BatteryRepository

    @Binds

    abstract fun bindBatteryRepository(

        impl: BatteryRepositoryDeprecatedImpl

    ): BatteryRepositoryDeprecated



    @Binds

    abstract fun bindDataStoreWrapperFactory(

packages/SystemUI/src/com/android/systemui/common/data/repository/BatteryRepository.kt→packages/SystemUI/src/com/android/systemui/common/data/repository/BatteryRepositoryDeprecated.kt

+9 −3
Original line number Diff line number Diff line
@@ -26,15 +26,21 @@ import kotlinx.coroutines.flow.Flow 
import kotlinx.coroutines.flow.SharingStarted

import kotlinx.coroutines.flow.stateIn



interface BatteryRepository {

@Deprecated(

    "Use com.android.systemui.statusbar.pipeline.battery.data.repository.BatteryRepository instead"

)

interface BatteryRepositoryDeprecated {

    val isDevicePluggedIn: Flow<Boolean>

}



@SysUISingleton

class BatteryRepositoryImpl

@Deprecated(

    "Use com.android.systemui.statusbar.pipeline.battery.data.repository.BatteryRepositoryImpl instead"

)

class BatteryRepositoryDeprecatedImpl

@Inject

constructor(@Background bgScope: CoroutineScope, batteryController: BatteryController) :

    BatteryRepository {

    BatteryRepositoryDeprecated {



    /** Returns {@code true} if the device is currently plugged in or wireless charging. */

    override val isDevicePluggedIn: Flow<Boolean> =