Fix intent extras merging and usage in VideoRecordingDeviceTest#516
Merged
Conversation
Fixed runMainActivityScenarioTest to merge compatMainActivityExtras with provided extras instead of ignoring them when extras are present. Updated VideoRecordingDeviceTest to use runMainActivityScenarioTestForResult instead of runScenarioTestForResult<MainActivity> to ensure compatMainActivityExtras are applied. TAG=agy CONV=ede7015c-6915-452c-91bf-1734f3aecca3
Fixed runMainActivityScenarioTest to merge compatMainActivityExtras with provided extras instead of ignoring them when extras are present. Updated VideoRecordingDeviceTest to use runMainActivityScenarioTestForResult instead of runScenarioTestForResult<MainActivity> to ensure compatMainActivityExtras are applied. TAG=agy CONV=ede7015c-6915-452c-91bf-1734f3aecca3
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Code Review
This pull request updates test utilities to support disabling animations through TestStorage and refactors MainActivity scenario tests to merge provided extras with compatibility settings. Feedback suggests adding KDoc documentation, using more restrictive visibility modifiers, removing debug logs, and extracting the extras-merging logic into a reusable helper function to improve maintainability and adhere to the DRY principle.
….d, and simplify return logic
…sedTimeUiState directly.
Kimblebee
approved these changes
May 20, 2026
Kimblebee
requested changes
May 20, 2026
# Conflicts: # .gemini/styleguide.md
# Conflicts: # app/src/androidTest/java/com/google/jetpackcamera/utils/UiTestUtil.kt
…aused state, move animation disabling to PR 519
…ean up imports and update KDoc/signature for ElapsedTimeText
# Conflicts: # app/src/androidTest/java/com/google/jetpackcamera/utils/UiTestUtil.kt
temcguir
force-pushed
the
temcguir/elapsed_time_opt
branch
6 times, most recently
from
2133254 to
d40c9ed
Compare
…nto temcguir/intent_extras_fix # Conflicts: # .gemini/styleguide.md # ui/components/capture/src/main/java/com/google/jetpackcamera/ui/components/capture/CaptureScreenComponents.kt # ui/uistateadapter/capture/src/main/java/com/google/jetpackcamera/ui/uistateadapter/capture/compound/CaptureUiStateAdapter.kt # ui/uistateadapter/capture/src/test/java/com/google/jetpackcamera/ui/uistateadapter/capture/CaptureUiStateAdapterTest.kt
temcguir
force-pushed
the
temcguir/intent_extras_fix
branch
from
1df4762 to
cd4e0a6
Compare
Kimblebee
approved these changes
Jun 5, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
The special logic to force "SingleLensMode" on emulators via
compatMainActivityExtraswas being lost when tests passed custom extras, or not used at all in tests returning results.Solution
runMainActivityScenarioTestinUiTestUtil.ktto properly mergecompatMainActivityExtraswith provided extras.VideoRecordingDeviceTest.ktto userunMainActivityScenarioTestForResultwhich handles this merging.Impact
Ensures emulators always run in single lens mode where intended, avoiding initialization timeouts.