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

Merge "Switch mixed-up ScreenshotRequest parameters" into tm-qpr-dev

Browse Source
This commit is contained in:
Matt Casey
2022-10-13 18:34:53 +00:00
committed by Android (Google) Code Review
parent b1eebad686 9b2e5991ce
commit b791973deb
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/screenshot/RequestProcessor.kt
View File

@@ -76,7 +76,7 @@ class RequestProcessor @Inject constructor(
)
} else {
// Create a new request of the same type which includes the top component
ScreenshotRequest(request.source, request.type, info.component)
ScreenshotRequest(request.type, request.source, info.component)
}
}

3
packages/SystemUI/tests/src/com/android/systemui/screenshot/RequestProcessorTest.kt
View File

@@ -99,13 +99,14 @@ class RequestProcessorTest {
policy.getDefaultDisplayId(),
DisplayContentInfo(component, bounds, UserHandle.of(USER_ID), TASK_ID))
val request = ScreenshotRequest(TAKE_SCREENSHOT_FULLSCREEN, SCREENSHOT_KEY_CHORD)
val request = ScreenshotRequest(TAKE_SCREENSHOT_FULLSCREEN, SCREENSHOT_OTHER)
val processor = RequestProcessor(imageCapture, policy, flags, scope)
val processedRequest = processor.process(request)
// Request has topComponent added, but otherwise unchanged.
assertThat(processedRequest.type).isEqualTo(TAKE_SCREENSHOT_FULLSCREEN)
assertThat(processedRequest.source).isEqualTo(SCREENSHOT_OTHER)
assertThat(processedRequest.topComponent).isEqualTo(component)
}