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

Commit 10c6c813 authored by Andre Le's avatar Andre Le Committed by Android (Google) Code Review
Browse files

Merge "QSDetailedView: Only dismiss screen record dialog in the dialog" into main

parents 2e529466 baa89426

packages/SystemUI/src/com/android/systemui/screenrecord/ScreenRecordPermissionDialogDelegate.kt

+7 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ import android.content.Context 
import android.hardware.display.DisplayManager

import android.hardware.display.DisplayManager

import android.os.Bundle

import android.os.Bundle

import android.os.UserHandle

import android.os.UserHandle

import android.view.View

import androidx.annotation.StyleRes

import androidx.annotation.StyleRes

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

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

import com.android.systemui.mediaprojection.MediaProjectionMetricsLogger

import com.android.systemui.mediaprojection.MediaProjectionMetricsLogger
@@ -119,6 +120,12 @@ class ScreenRecordPermissionDialogDelegate( 
        super<BaseMediaProjectionPermissionDialogDelegate>.onCreate(dialog, savedInstanceState)

        super<BaseMediaProjectionPermissionDialogDelegate>.onCreate(dialog, savedInstanceState)

        setDialogTitle(R.string.screenrecord_permission_dialog_title)

        setDialogTitle(R.string.screenrecord_permission_dialog_title)

        dialog.setTitle(R.string.screenrecord_title)

        dialog.setTitle(R.string.screenrecord_title)

        setStartButtonOnClickListener { v: View? ->

            val screenRecordViewBinder: ScreenRecordPermissionViewBinder? =

                viewBinder as ScreenRecordPermissionViewBinder?

            screenRecordViewBinder?.startButtonOnClicked()

            dialog.dismiss()

        }

        setCancelButtonOnClickListener { dialog.dismiss() }

        setCancelButtonOnClickListener { dialog.dismiss() }

    }

    }

}
 
}

packages/SystemUI/src/com/android/systemui/screenrecord/ScreenRecordPermissionViewBinder.kt

+30 −29
Original line number Original line Diff line number Diff line
@@ -79,7 +79,10 @@ class ScreenRecordPermissionViewBinder( 
    override fun bind() {

    override fun bind() {

        super.bind()

        super.bind()

        initRecordOptionsView()

        initRecordOptionsView()

        setStartButtonOnClickListener { _: View? ->

        setStartButtonOnClickListener { startButtonOnClicked() }

    }



    fun startButtonOnClicked() {

        onStartRecordingClicked?.run()

        onStartRecordingClicked?.run()

        if (selectedScreenShareOption.mode == ENTIRE_SCREEN) {

        if (selectedScreenShareOption.mode == ENTIRE_SCREEN) {

            requestScreenCapture(

            requestScreenCapture(
@@ -109,8 +112,6 @@ class ScreenRecordPermissionViewBinder( 
            )

            )

            activityStarter.startActivity(intent, /* dismissShade= */ true)

            activityStarter.startActivity(intent, /* dismissShade= */ true)

        }

        }

            dialog.dismiss()

        }

    }

    }





    @SuppressLint("ClickableViewAccessibility")

    @SuppressLint("ClickableViewAccessibility")