Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Partial Screensharing] Enable recent tasks" into tm-qpr-dev

Browse Source
This commit is contained in:
Nick Chameyev
2022-10-20 17:32:09 +00:00
committed by Android (Google) Code Review
parent 26c1fd792c 8250a0a25d
commit 39413173c6
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/screenshot/src/com/android/systemui/testing/screenshot/ExternalViewScreenshotTestRule.kt
View File

@@ -19,6 +19,7 @@ package com.android.systemui.testing.screenshot
import android.app.Activity import android.app.Activity
import android.graphics.Color import android.graphics.Color
import android.view.View import android.view.View
import android.view.Window
import android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES import android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
import androidx.core.view.WindowInsetsCompat import androidx.core.view.WindowInsetsCompat
import androidx.core.view.WindowInsetsControllerCompat import androidx.core.view.WindowInsetsControllerCompat
@@ -51,13 +52,14 @@ class ExternalViewScreenshotTestRule(emulationSpec: DeviceEmulationSpec) : TestR
/** /**
* Compare the content of the [view] with the golden image identified by [goldenIdentifier] in * Compare the content of the [view] with the golden image identified by [goldenIdentifier] in
* the context of [emulationSpec]. * the context of [emulationSpec]. Window must be specified to capture views that render
* hardware buffers.
*/ */
fun screenshotTest(goldenIdentifier: String, view: View) { fun screenshotTest(goldenIdentifier: String, view: View, window: Window? = null) {
view.removeElevationRecursively() view.removeElevationRecursively()
ScreenshotRuleAsserter.Builder(screenshotRule) ScreenshotRuleAsserter.Builder(screenshotRule)
.setScreenshotProvider { view.toBitmap() } .setScreenshotProvider { view.toBitmap(window) }
.withMatcher(matcher) .withMatcher(matcher)
.build() .build()
.assertGoldenImage(goldenIdentifier) .assertGoldenImage(goldenIdentifier)
@@ -94,6 +96,6 @@ class ExternalViewScreenshotTestRule(emulationSpec: DeviceEmulationSpec) : TestR
activity.currentFocus?.clearFocus() activity.currentFocus?.clearFocus()
} }
screenshotTest(goldenIdentifier, rootView) screenshotTest(goldenIdentifier, rootView, activity.window)
} }
} }

3
packages/SystemUI/src/com/android/systemui/media/MediaProjectionAppSelectorActivity.kt
View File

@@ -182,8 +182,7 @@ class MediaProjectionAppSelectorActivity(
override fun shouldGetOnlyDefaultActivities() = false override fun shouldGetOnlyDefaultActivities() = false
// TODO(b/240924732) flip the flag when the recents selector is ready override fun shouldShowContentPreview() = true
override fun shouldShowContentPreview() = false
override fun createContentPreviewView(parent: ViewGroup): ViewGroup = override fun createContentPreviewView(parent: ViewGroup): ViewGroup =
recentsViewController.createView(parent) recentsViewController.createView(parent)