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

Commit cd92b5dc authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Android (Google) Code Review
Browse files

Merge changes Icd1cbc6a,I487ced4c into main 

* changes:
  [SB][Screen Chips] Implement the screen record chip flow.
  [SB][Screen Chips] Move OngoingActivityChipModel to domain layer.
parents d7a5e6a8 764e8540

packages/SystemUI/src/com/android/systemui/statusbar/chips/call/domain/interactor/CallChipInteractor.kt

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package com.android.systemui.statusbar.chips.call.domain.interactor 


import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.statusbar.chips.domain.interactor.OngoingActivityChipInteractor

import com.android.systemui.statusbar.chips.ui.model.OngoingActivityChipModel

import com.android.systemui.statusbar.chips.domain.model.OngoingActivityChipModel

import javax.inject.Inject

import kotlinx.coroutines.flow.MutableStateFlow

import kotlinx.coroutines.flow.StateFlow

packages/SystemUI/src/com/android/systemui/statusbar/chips/domain/interactor/OngoingActivityChipInteractor.kt

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.systemui.statusbar.chips.domain.interactor



import com.android.systemui.statusbar.chips.ui.model.OngoingActivityChipModel

import com.android.systemui.statusbar.chips.domain.model.OngoingActivityChipModel

import kotlinx.coroutines.flow.StateFlow



/** Interface for an interactor that knows the state of a single type of ongoing activity chip. */

packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/model/OngoingActivityChipModel.kt→packages/SystemUI/src/com/android/systemui/statusbar/chips/domain/model/OngoingActivityChipModel.kt

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

 */



package com.android.systemui.statusbar.chips.ui.model

package com.android.systemui.statusbar.chips.domain.model



import android.view.View

import com.android.systemui.common.shared.model.Icon

packages/SystemUI/src/com/android/systemui/statusbar/chips/screenrecord/domain/interactor/ScreenRecordChipInteractor.kt

+39 −5
Original line number Diff line number Diff line
@@ -16,17 +16,51 @@ 


package com.android.systemui.statusbar.chips.screenrecord.domain.interactor



import com.android.systemui.common.shared.model.Icon

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.statusbar.chips.ui.model.OngoingActivityChipModel

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

import com.android.systemui.res.R

import com.android.systemui.screenrecord.data.model.ScreenRecordModel

import com.android.systemui.screenrecord.data.repository.ScreenRecordRepository

import com.android.systemui.statusbar.chips.domain.interactor.OngoingActivityChipInteractor

import com.android.systemui.statusbar.chips.domain.model.OngoingActivityChipModel

import com.android.systemui.util.time.SystemClock

import javax.inject.Inject

import kotlinx.coroutines.flow.MutableStateFlow

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.flow.SharingStarted

import kotlinx.coroutines.flow.StateFlow

import kotlinx.coroutines.flow.map

import kotlinx.coroutines.flow.stateIn



/** Interactor for the screen recording chip shown in the status bar. */

@SysUISingleton

open class ScreenRecordChipInteractor @Inject constructor() : OngoingActivityChipInteractor {

    // TODO(b/332662551): Implement this flow.

open class ScreenRecordChipInteractor

@Inject

constructor(

    @Application scope: CoroutineScope,

    screenRecordRepository: ScreenRecordRepository,

    val systemClock: SystemClock,

) : OngoingActivityChipInteractor {

    override val chip: StateFlow<OngoingActivityChipModel> =

        MutableStateFlow(OngoingActivityChipModel.Hidden)

        screenRecordRepository.screenRecordState

            .map { state ->

                when (state) {

                    is ScreenRecordModel.DoingNothing,

                    // TODO(b/332662551): Implement the 3-2-1 countdown chip.

                    is ScreenRecordModel.Starting -> OngoingActivityChipModel.Hidden

                    is ScreenRecordModel.Recording ->

                        OngoingActivityChipModel.Shown(

                            // TODO(b/332662551): Also provide a content description.

                            icon =

                                Icon.Resource(

                                    R.drawable.stat_sys_screen_record,

                                    contentDescription = null

                                ),

                            startTimeMs = systemClock.elapsedRealtime()

                        ) {

                            // TODO(b/332662551): Implement the pause dialog.

                        }

                }

            }

            .stateIn(scope, SharingStarted.WhileSubscribed(), OngoingActivityChipModel.Hidden)

}

packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/viewmodel/OngoingActivityChipsViewModel.kt

+1 −1
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ package com.android.systemui.statusbar.chips.ui.viewmodel 
import com.android.systemui.dagger.SysUISingleton

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

import com.android.systemui.statusbar.chips.call.domain.interactor.CallChipInteractor

import com.android.systemui.statusbar.chips.domain.model.OngoingActivityChipModel

import com.android.systemui.statusbar.chips.screenrecord.domain.interactor.ScreenRecordChipInteractor

import com.android.systemui.statusbar.chips.ui.model.OngoingActivityChipModel

import javax.inject.Inject

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.flow.SharingStarted