Merge changes I438ffc79,I0be4fefe into main (305f6e3d) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/screencapture/record/largescreen/domain/interactor/ScreenCaptureRecordLargeScreenFeaturesInteractor.kt

0 → 100644

+26 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2025 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.systemui.screencapture.record.largescreen.domain.interactor

		import com.android.systemui.dagger.SysUISingleton
		import javax.inject.Inject

		@SysUISingleton
		class ScreenCaptureRecordLargeScreenFeaturesInteractor @Inject constructor() {
		// TODO(b/427497534) Guard behind a new feature flag specific for app window region.
		val appWindowRegionSupported = true
		}

packages/SystemUI/src/com/android/systemui/screencapture/ui/viewmodel/ScreenCaptureViewModel.kt

+45 −21

Original line number	Diff line number	Diff line
		@@ -20,6 +20,8 @@ import android.content.Context
		import com.android.systemui.dagger.qualifiers.Application
		import com.android.systemui.lifecycle.HydratedActivatable
		import com.android.systemui.res.R
		import com.android.systemui.screencapture.domain.interactor.ScreenshotInteractor
		import com.android.systemui.screencapture.record.largescreen.domain.interactor.ScreenCaptureRecordLargeScreenFeaturesInteractor
		import dagger.assisted.AssistedFactory
		import dagger.assisted.AssistedInject
		import kotlinx.coroutines.coroutineScope
		@@ -38,12 +40,14 @@ enum class ScreenCaptureRegion {
		APP_WINDOW,
		}

		/** Models state for the Screen Capture UI */
		/** Models UI for the Screen Capture UI for large screen devices. */
		class ScreenCaptureViewModel
		@AssistedInject
		constructor(
		@Application private val context: Context,
		@Application private val applicationContext: Context,
		private val iconProvider: ScreenCaptureIconProvider,
		private val screenshotInteractor: ScreenshotInteractor,
		private val featuresInteractor: ScreenCaptureRecordLargeScreenFeaturesInteractor,
		) : HydratedActivatable() {
		private val captureTypeSource = MutableStateFlow(ScreenCaptureType.SCREENSHOT)
		private val captureRegionSource = MutableStateFlow(ScreenCaptureRegion.FULLSCREEN)
		@@ -81,6 +85,15 @@ constructor(
		captureRegionSource.value = selectedRegion
		}

		suspend fun takeFullscreenScreenshot() {
		require(captureTypeSource.value == ScreenCaptureType.SCREENSHOT)
		require(captureRegionSource.value == ScreenCaptureRegion.FULLSCREEN)

		screenshotInteractor.takeFullscreenScreenshot()

		// TODO(b/427500006) Close the window after requesting a fullscreen screenshot.
		}

		override suspend fun onActivated() {
		coroutineScope { launch { iconProvider.collectIcons() } }
		}
		@@ -92,13 +105,14 @@ constructor(
		return listOf(
		RadioButtonGroupItemViewModel(
		icon = icons?.screenRecord,
		label = context.getString(R.string.screen_capture_toolbar_record_button),
		label = applicationContext.getString(R.string.screen_capture_toolbar_record_button),
		isSelected = selectedType == ScreenCaptureType.SCREEN_RECORD,
		onClick = { updateCaptureType(ScreenCaptureType.SCREEN_RECORD) },
		),
		RadioButtonGroupItemViewModel(
		icon = icons?.screenshot,
		label = context.getString(R.string.screen_capture_toolbar_capture_button),
		label =
		applicationContext.getString(R.string.screen_capture_toolbar_capture_button),
		isSelected = selectedType == ScreenCaptureType.SCREENSHOT,
		onClick = { updateCaptureType(ScreenCaptureType.SCREENSHOT) },
		),
		@@ -109,23 +123,33 @@ constructor(
		selectedRegion: ScreenCaptureRegion,
		icons: ScreenCaptureIcons?,
		): List<RadioButtonGroupItemViewModel> {
		return listOf(
		return buildList {
		if (featuresInteractor.appWindowRegionSupported) {
		add(
		RadioButtonGroupItemViewModel(
		icon = icons?.appWindow,
		isSelected = (selectedRegion == ScreenCaptureRegion.APP_WINDOW),
		onClick = { updateCaptureRegion(ScreenCaptureRegion.APP_WINDOW) },
		),
		)
		)
		}

		add(
		RadioButtonGroupItemViewModel(
		icon = icons?.region,
		isSelected = (selectedRegion == ScreenCaptureRegion.PARTIAL),
		onClick = { updateCaptureRegion(ScreenCaptureRegion.PARTIAL) },
		),
		)
		)

		add(
		RadioButtonGroupItemViewModel(
		icon = icons?.fullscreen,
		isSelected = (selectedRegion == ScreenCaptureRegion.FULLSCREEN),
		onClick = { updateCaptureRegion(ScreenCaptureRegion.FULLSCREEN) },
		),
		)
		)
		}
		}

		@AssistedFactory

packages/SystemUI/tests/src/com/android/systemui/screencapture/ui/viewmodel/ScreenCaptureViewModelTest.kt

+49 −0

Original line number	Diff line number	Diff line
		@@ -16,18 +16,29 @@

		package com.android.systemui.screencapture.ui.viewmodel

		import android.view.WindowManager
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.internal.util.ScreenshotRequest
		import com.android.internal.util.mockScreenshotHelper
		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.testKosmos
		import com.google.common.truth.Truth.assertThat
		import kotlin.test.assertFailsWith
		import kotlinx.coroutines.test.runTest
		import org.junit.Before
		import org.junit.Test
		import org.junit.runner.RunWith
		import org.mockito.ArgumentCaptor
		import org.mockito.ArgumentMatchers.isNull
		import org.mockito.Captor
		import org.mockito.MockitoAnnotations
		import org.mockito.kotlin.any
		import org.mockito.kotlin.times
		import org.mockito.kotlin.verify

		@SmallTest
		@RunWith(AndroidJUnit4::class)
		@@ -35,10 +46,12 @@ class ScreenCaptureViewModelTest : SysuiTestCase() {
		private val kosmos = testKosmos().useUnconfinedTestDispatcher()
		private val testScope = kosmos.testScope

		@Captor private lateinit var screenshotRequestCaptor: ArgumentCaptor<ScreenshotRequest>
		private val viewModel: ScreenCaptureViewModel by lazy { kosmos.screenCaptureViewModel }

		@Before
		fun setUp() {
		MockitoAnnotations.openMocks(this)
		viewModel.activateIn(testScope)
		}

		@@ -105,4 +118,40 @@ class ScreenCaptureViewModelTest : SysuiTestCase() {
		assertThat(partialButton3.isSelected).isFalse()
		assertThat(fullscreenButton3.isSelected).isFalse()
		}

		@Test
		fun takeFullscreenScreenshot_callsScreenshotInteractor() =
		testScope.runTest {
		viewModel.updateCaptureType(ScreenCaptureType.SCREENSHOT)
		viewModel.updateCaptureRegion(ScreenCaptureRegion.FULLSCREEN)

		viewModel.takeFullscreenScreenshot()

		verify(kosmos.mockScreenshotHelper, times(1))
		.takeScreenshot(screenshotRequestCaptor.capture(), any(), isNull())
		val capturedRequest = screenshotRequestCaptor.value
		assertThat(capturedRequest.type).isEqualTo(WindowManager.TAKE_SCREENSHOT_FULLSCREEN)
		}

		@Test
		fun takeFullscreenScreenshot_validatesCaptureType() =
		testScope.runTest {
		viewModel.updateCaptureType(ScreenCaptureType.SCREEN_RECORD)
		viewModel.updateCaptureRegion(ScreenCaptureRegion.FULLSCREEN)

		assertFailsWith(IllegalArgumentException::class) {
		viewModel.takeFullscreenScreenshot()
		}
		}

		@Test
		fun takeFullscreenScreenshot_validatesCaptureRegion() =
		testScope.runTest {
		viewModel.updateCaptureType(ScreenCaptureType.SCREENSHOT)
		viewModel.updateCaptureRegion(ScreenCaptureRegion.PARTIAL)

		assertFailsWith(IllegalArgumentException::class) {
		viewModel.takeFullscreenScreenshot()
		}
		}
		}

packages/SystemUI/tests/utils/src/com/android/systemui/screencapture/record/largescreen/domain/interactor/ScreenCaptureRecordLargeScreenFeaturesInteractorKosmos.kt

0 → 100644

+24 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2025 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.systemui.screencapture.record.largescreen.domain.interactor

		import com.android.systemui.kosmos.Kosmos
		import com.android.systemui.kosmos.Kosmos.Fixture

		val Kosmos.screenCaptureRecordLargeScreenFeaturesInteractor by Fixture {
		ScreenCaptureRecordLargeScreenFeaturesInteractor()
		}

packages/SystemUI/tests/utils/src/com/android/systemui/screencapture/ui/viewmodel/ScreenCaptureViewModelKosmos.kt

+5 −1

Original line number	Diff line number	Diff line
		@@ -19,10 +19,14 @@ package com.android.systemui.screencapture.ui.viewmodel
		import android.content.applicationContext
		import com.android.systemui.kosmos.Kosmos
		import com.android.systemui.kosmos.Kosmos.Fixture
		import com.android.systemui.screencapture.domain.interactor.screenshotInteractor
		import com.android.systemui.screencapture.record.largescreen.domain.interactor.screenCaptureRecordLargeScreenFeaturesInteractor

		val Kosmos.screenCaptureViewModel by Fixture {
		ScreenCaptureViewModel(
		context = applicationContext,
		applicationContext = applicationContext,
		iconProvider = screenCaptureIconProviderKosmos,
		screenshotInteractor = screenshotInteractor,
		featuresInteractor = screenCaptureRecordLargeScreenFeaturesInteractor,
		)
		}