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

Commit e8540836 authored by Wes Okuhara's avatar Wes Okuhara Committed by Android (Google) Code Review
Browse files

Merge changes I56798a64,I5bfb85d9 into main 

* changes:
  Screen capture: Escape keypress closes the activity
  Desktop screenshots: Close buttons finishes the screen capture activity
parents 732a8c63 6bcc447c

packages/SystemUI/src/com/android/systemui/screencapture/record/largescreen/ui/compose/PreCaptureUI.kt

+1 −3
Original line number Diff line number Diff line
@@ -47,9 +47,7 @@ fun PreCaptureUI(viewModel: PreCaptureViewModel) { 
            PreCaptureToolbar(

                viewModel = viewModel,

                expanded = true,

                onCloseClick = {

                    // TODO(b/424792547) Close the activity.

                },

                onCloseClick = { viewModel.closeUI() },

            )

        }

packages/SystemUI/src/com/android/systemui/screencapture/record/largescreen/ui/viewmodel/PreCaptureViewModel.kt

+7 −0
Original line number Diff line number Diff line
@@ -23,10 +23,12 @@ import com.android.systemui.dagger.qualifiers.Application 
import com.android.systemui.dagger.qualifiers.Background

import com.android.systemui.lifecycle.HydratedActivatable

import com.android.systemui.res.R

import com.android.systemui.screencapture.common.ScreenCapture

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

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

import com.android.systemui.screencapture.record.largescreen.domain.interactor.ScreenCaptureRecordLargeScreenFeaturesInteractor

import com.android.systemui.screencapture.record.largescreen.domain.interactor.ScreenshotInteractor

import com.android.systemui.screencapture.ui.ScreenCaptureActivity

import dagger.assisted.AssistedFactory

import dagger.assisted.AssistedInject

import kotlinx.coroutines.CoroutineScope
@@ -50,6 +52,7 @@ enum class ScreenCaptureRegion { 
class PreCaptureViewModel

@AssistedInject

constructor(

    @ScreenCapture private val activity: ScreenCaptureActivity,

    @Application private val applicationContext: Context,

    @Background private val backgroundScope: CoroutineScope,

    private val iconProvider: ScreenCaptureIconProvider,
@@ -111,6 +114,10 @@ constructor( 
        // TODO(b/427541309) Update region box position and size.

    }



    fun closeUI() {

        activity.finish()

    }



    override suspend fun onActivated() {

        coroutineScope { launch { iconProvider.collectIcons() } }

    }

packages/SystemUI/src/com/android/systemui/screencapture/ui/ScreenCaptureActivity.kt

+16 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.systemui.screencapture.ui



import android.os.Bundle

import android.view.KeyEvent

import android.view.Window

import android.view.WindowManager

import androidx.activity.ComponentActivity
@@ -67,6 +68,21 @@ constructor( 
        component = null

        super.onDestroy()

    }



    override fun onKeyUp(keyCode: Int, event: KeyEvent): Boolean {

        val noModifierKeys =

            !event.isShiftPressed &&

                !event.isCtrlPressed &&

                !event.isAltPressed &&

                !event.isMetaPressed

        return when {

            (keyCode == KeyEvent.KEYCODE_ESCAPE && noModifierKeys) -> {

                finish()

                true

            }

            else -> super.onKeyUp(keyCode, event)

        }

    }

}



private fun Window.updateAttributes(update: WindowManager.LayoutParams.() -> Unit) {

packages/SystemUI/tests/src/com/android/systemui/screencapture/record/largescreen/ui/viewmodel/PreCaptureViewModelTest.kt

+9 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import com.android.systemui.SysuiTestCase 
import com.android.systemui.kosmos.testScope

import com.android.systemui.kosmos.useUnconfinedTestDispatcher

import com.android.systemui.lifecycle.activateIn

import com.android.systemui.screencapture.ui.mockScreenCaptureActivity

import com.android.systemui.testKosmos

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

import kotlin.test.assertFailsWith
@@ -192,4 +193,12 @@ class PreCaptureViewModelTest : SysuiTestCase() { 
            viewModel.updateCaptureRegion(ScreenCaptureRegion.APP_WINDOW)

            assertThat(viewModel.captureRegionButtonViewModels.count { it.isSelected }).isEqualTo(1)

        }



    @Test

    fun closeUI_finishesActivity() =

        testScope.runTest {

            viewModel.closeUI()



            verify(kosmos.mockScreenCaptureActivity, times(1)).finish()

        }

}

packages/SystemUI/tests/utils/src/com/android/systemui/screencapture/record/largescreen/ui/viewmodel/PreCaptureViewModelKosmos.kt

+2 −0
Original line number Diff line number Diff line
@@ -23,9 +23,11 @@ import com.android.systemui.kosmos.backgroundScope 
import com.android.systemui.screencapture.common.ui.viewmodel.drawableLoaderViewModelImpl

import com.android.systemui.screencapture.record.largescreen.domain.interactor.screenCaptureRecordLargeScreenFeaturesInteractor

import com.android.systemui.screencapture.record.largescreen.domain.interactor.screenshotInteractor

import com.android.systemui.screencapture.ui.mockScreenCaptureActivity



val Kosmos.preCaptureViewModel by Fixture {

    PreCaptureViewModel(

        activity = mockScreenCaptureActivity,

        applicationContext = applicationContext,

        backgroundScope = backgroundScope,

        iconProvider = screenCaptureIconProviderKosmos,