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

Commit 257b00fb authored by Anton Potapov's avatar Anton Potapov
Browse files

Hide show touches option for when recording a single app 

Flag: com.android.systemui.new_screen_record_toolbar
Fixes: 443977967
Test: manual on foldable
Change-Id: I3e1b5c9d0797d6d3f1a4aa7a6201f5b6348009fb
parent 39bf2614

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

+17 −12
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import com.android.systemui.res.R 
import com.android.systemui.screencapture.common.ui.compose.LoadingIcon

import com.android.systemui.screencapture.common.ui.compose.loadIcon

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

import com.android.systemui.screencapture.record.smallscreen.ui.viewmodel.RecordDetailsTargetItemViewModel

import com.android.systemui.screencapture.record.smallscreen.ui.viewmodel.RecordDetailsTargetViewModel

import com.android.systemui.screencapture.record.ui.viewmodel.ScreenCaptureRecordParametersViewModel
@@ -115,6 +116,9 @@ fun RecordDetailsSettings( 
                onCheckedChange = { parametersViewModel.setShouldShowFrontCamera(it) },

                modifier = Modifier,

            )

            AnimatedVisibility(

                targetViewModel.currentTarget is RecordDetailsTargetItemViewModel.EntireScreen

            ) {

                RichSwitch(

                    icon =

                        loadIcon(
@@ -130,6 +134,7 @@ fun RecordDetailsSettings( 
            }

        }

    }

}



@Composable

private fun RichSwitch(

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

+6 −4
Original line number Diff line number Diff line
@@ -133,10 +133,11 @@ constructor( 
    }



    private fun startRecording() {

        val shouldShowTaps = recordDetailsParametersViewModel.shouldShowTaps ?: return

        val audioSource = recordDetailsParametersViewModel.audioSource ?: return

        when (val target = recordDetailsTargetViewModel.currentTarget?.screenCaptureTarget) {

            is ScreenCaptureTarget.Fullscreen ->

        val target = recordDetailsTargetViewModel.currentTarget?.screenCaptureTarget ?: return

        when (target) {

            is ScreenCaptureTarget.Fullscreen -> {

                val shouldShowTaps = recordDetailsParametersViewModel.shouldShowTaps ?: return

                screenRecordingServiceInteractor.startRecording(

                    ScreenRecordingParameters(

                        captureTarget = null,
@@ -145,6 +146,7 @@ constructor( 
                        audioSource = audioSource,

                    )

                )

            }

            is ScreenCaptureTarget.App -> {

                val cookie = LaunchCookie("screen_record")

                activityTaskManager.startActivityFromRecents(
@@ -165,7 +167,7 @@ constructor( 
                                taskId = target.taskId,

                            ),

                        displayId = target.displayId,

                        shouldShowTaps = shouldShowTaps,

                        shouldShowTaps = false,

                        audioSource = audioSource,

                    )

                )