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

Commit 187fc8b6 authored by Anton Potapov's avatar Anton Potapov
Browse files

Move CaptioningRepository to SystemUI space from the SettingsLib 

Flag: EXEMPT BUGFIX
Bug: 361042246
Test: atest CaptioningViewModelTest
Test: atest VolumePanelScreenshotTest
Change-Id: I975dfe130d3c54ead83917be3487794010aadafa
parent 6c00ad0a

packages/SettingsLib/tests/integ/src/com/android/settingslib/view/accessibility/data/repository/CaptioningRepositoryTest.kt→packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/data/repository/CaptioningRepositoryTest.kt

+3 −2
Original line number Diff line number Diff line
@@ -14,11 +14,12 @@ 
 *  limitations under the License.

 */



package com.android.settingslib.view.accessibility.data.repository

package com.android.systemui.accessibility.data.repository



import android.view.accessibility.CaptioningManager

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.google.common.truth.Truth.assertThat

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.flow.launchIn
@@ -40,7 +41,7 @@ import org.mockito.MockitoAnnotations 
@SmallTest

@Suppress("UnspecifiedRegisterReceiverFlag")

@RunWith(AndroidJUnit4::class)

class CaptioningRepositoryTest {

class CaptioningRepositoryTest : SysuiTestCase() {



    @Captor

    private lateinit var listenerCaptor: ArgumentCaptor<CaptioningManager.CaptioningChangeListener>

packages/SystemUI/multivalentTests/src/com/android/systemui/volume/panel/component/captioning/ui/viewmodel/CaptioningViewModelTest.kt

+4 −3
Original line number Diff line number Diff line
@@ -20,11 +20,12 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 
import androidx.test.filters.SmallTest

import com.android.internal.logging.uiEventLogger

import com.android.systemui.SysuiTestCase

import com.android.systemui.accessibility.data.repository.captioningRepository

import com.android.systemui.accessibility.domain.interactor.captioningInteractor

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.kosmos.applicationCoroutineScope

import com.android.systemui.kosmos.testScope

import com.android.systemui.testKosmos

import com.android.systemui.view.accessibility.data.repository.captioningInteractor

import com.android.systemui.view.accessibility.data.repository.captioningRepository

import com.google.common.truth.Truth.assertThat

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.test.runCurrent
@@ -49,7 +50,7 @@ class CaptioningViewModelTest : SysuiTestCase() { 
                CaptioningViewModel(

                    context,

                    captioningInteractor,

                    testScope.backgroundScope,

                    applicationCoroutineScope,

                    uiEventLogger,

                )

            }

packages/SettingsLib/src/com/android/settingslib/view/accessibility/data/repository/CaptioningRepository.kt→packages/SystemUI/src/com/android/systemui/accessibility/data/repository/CaptioningRepository.kt

+10 −10
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.settingslib.view.accessibility.data.repository

package com.android.systemui.accessibility.data.repository



import android.view.accessibility.CaptioningManager

import kotlin.coroutines.CoroutineContext

packages/SettingsLib/src/com/android/settingslib/view/accessibility/domain/interactor/CaptioningInteractor.kt→packages/SystemUI/src/com/android/systemui/accessibility/domain/interactor/CaptioningInteractor.kt

+32 −0
Original line number Diff line number Diff line
@@ -14,9 +14,9 @@ 
 * limitations under the License.

 */



package com.android.settingslib.view.accessibility.domain.interactor

package com.android.systemui.accessibility.domain.interactor



import com.android.settingslib.view.accessibility.data.repository.CaptioningRepository

import com.android.systemui.accessibility.data.repository.CaptioningRepository

import kotlinx.coroutines.flow.StateFlow



class CaptioningInteractor(private val repository: CaptioningRepository) {

packages/SystemUI/src/com/android/systemui/volume/dagger/CaptioningModule.kt

+3 −3
Original line number Diff line number Diff line
@@ -17,9 +17,9 @@ 
package com.android.systemui.volume.dagger



import android.view.accessibility.CaptioningManager

import com.android.settingslib.view.accessibility.data.repository.CaptioningRepository

import com.android.settingslib.view.accessibility.data.repository.CaptioningRepositoryImpl

import com.android.settingslib.view.accessibility.domain.interactor.CaptioningInteractor

import com.android.systemui.accessibility.data.repository.CaptioningRepository

import com.android.systemui.accessibility.data.repository.CaptioningRepositoryImpl

import com.android.systemui.accessibility.domain.interactor.CaptioningInteractor

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Application

import com.android.systemui.dagger.qualifiers.Background