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

Commit b791973d authored by Matt Casey's avatar Matt Casey Committed by Android (Google) Code Review
Browse files

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

parents b1eebad6 9b2e5991

packages/SystemUI/src/com/android/systemui/screenshot/RequestProcessor.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -76,7 +76,7 @@ class RequestProcessor @Inject constructor( 
                )

                )

            } else {

            } else {

                // Create a new request of the same type which includes the top component

                // 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)

            }

            }

        }

        }

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -99,13 +99,14 @@ class RequestProcessorTest { 
            policy.getDefaultDisplayId(),

            policy.getDefaultDisplayId(),

            DisplayContentInfo(component, bounds, UserHandle.of(USER_ID), TASK_ID))

            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 processor = RequestProcessor(imageCapture, policy, flags, scope)





        val processedRequest = processor.process(request)

        val processedRequest = processor.process(request)





        // Request has topComponent added, but otherwise unchanged.

        // Request has topComponent added, but otherwise unchanged.

        assertThat(processedRequest.type).isEqualTo(TAKE_SCREENSHOT_FULLSCREEN)

        assertThat(processedRequest.type).isEqualTo(TAKE_SCREENSHOT_FULLSCREEN)

        assertThat(processedRequest.source).isEqualTo(SCREENSHOT_OTHER)

        assertThat(processedRequest.topComponent).isEqualTo(component)

        assertThat(processedRequest.topComponent).isEqualTo(component)

    }

    }