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

Commit 0dbba385 authored by Anton Potapov's avatar Anton Potapov
Browse files

Navigate to screen recording toolbar when retaking 

Flag: com.android.systemui.new_screen_record_toolbar
Fixes: 430553811
Test: manual on foldable: check that retake opens a toolbar
Change-Id: Ie4f1220029062589fa233d9258cf76d8c206f8f0
parent 55d95ed4

packages/SystemUI/src/com/android/systemui/screencapture/record/smallscreen/ui/SmallScreenPostRecordingActivity.kt

+4 −1
Original line number Diff line number Diff line
@@ -110,7 +110,10 @@ constructor( 
                ) {

                    val rowModifier = Modifier.weight(1f).fillMaxHeight()

                    PostRecordButton(

                        onClick = { viewModel.retake() },

                        onClick = {

                            viewModel.retake()

                            finish()

                        },

                        drawableLoaderViewModel = viewModel,

                        iconRes = R.drawable.ic_arrow_back,

                        labelRes = R.string.screen_record_retake,

packages/SystemUI/src/com/android/systemui/screencapture/record/smallscreen/ui/viewmodel/PostRecordingViewModel.kt

+7 −1
Original line number Diff line number Diff line
@@ -22,8 +22,11 @@ import android.net.Uri 
import com.android.systemui.lifecycle.HydratedActivatable

import com.android.systemui.plugins.ActivityStarter

import com.android.systemui.res.R

import com.android.systemui.screencapture.common.shared.model.ScreenCaptureType

import com.android.systemui.screencapture.common.shared.model.ScreenCaptureUiParameters

import com.android.systemui.screencapture.common.ui.viewmodel.DrawableLoaderViewModel

import com.android.systemui.screencapture.common.ui.viewmodel.DrawableLoaderViewModelImpl

import com.android.systemui.screencapture.domain.interactor.ScreenCaptureUiInteractor

import dagger.assisted.Assisted

import dagger.assisted.AssistedFactory

import dagger.assisted.AssistedInject
@@ -37,10 +40,13 @@ constructor( 
    private val context: Context,

    private val activityStarter: ActivityStarter,

    private val drawableLoaderViewModelImpl: DrawableLoaderViewModelImpl,

    private val screenCaptureUiInteractor: ScreenCaptureUiInteractor,

) : HydratedActivatable(), DrawableLoaderViewModel by drawableLoaderViewModelImpl {



    fun retake() {

        // TODO(b/430553811) Implement

        screenCaptureUiInteractor.show(

            ScreenCaptureUiParameters(screenCaptureType = ScreenCaptureType.RECORD)

        )

    }



    fun edit() {