Delete concurrent camera quick setting#512
Merged
Merged
Conversation
Migrates the concurrent camera toggle from the Quick Settings bottom
sheet
to the main Settings screen.
Changes:
- Added ConcurrentCameraMode to JcaSettings proto and SettingsRepository.
- Updated CameraSystem to apply concurrent camera setting changes.
- Added ConcurrentCameraSetting UI and state to feature/settings.
- Removed concurrent camera toggle from QuickSettingsScreen.
- Updated ConcurrentCameraTest to toggle the setting via Settings screen.
![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 migrates the Concurrent Camera setting from the Quick Settings menu to the main Settings screen. The changes include updating the proto datastore for persistence, implementing the setting toggle in the UI, and refactoring instrumented tests to verify the setting via the Settings screen. Reviewer feedback suggests using more idiomatic Compose testing matchers like assertIsOn(), removing redundant support checks in tests, and applying the internal visibility modifier to new functions and composables. Additionally, the reviewer noted a potentially missing file (CameraAppSettings) and emphasized the requirement to synchronize default values across the datastore and the app's default settings.
Kimblebee
changed the title
Kimblebee
force-pushed
the
kim/feature/concurrent-camera-settings
branch
from
1079495 to
42d1f7a
Compare
davidjiagoogle
approved these changes
Jun 3, 2026
Kimblebee
force-pushed
the
kim/feature/concurrent-camera-settings
branch
from
a539a08 to
7d8566c
Compare
- Consolidated rationales in SettingsUiState: removed redundant
`ConcurrentCameraStreamConfigRationale` and merged it into
`ConcurrentCameraDisabledRationale` with a specific reason string.
- Renamed `ConcurrentCameraUnsupportedRationale` to
`ConcurrentCameraActiveRationale` to better clarify its meaning
(disabled because concurrent camera is active).
- Improved the phrasing of the stream configuration conflict error message
to "Single Stream does not support concurrent camera" for clarity.
- Restricted visibility of the `SettingsList` Composable to `internal`.
- Cleaned up debug log statement in `SettingsViewModel.setConcurrentCameraMode`.
- Simplified integration tests in `CameraAppSettingsViewModelTest` by
introducing a `createViewModelWithConstraints` helper, reducing setup
duplication across 9 test cases.
- Optimized UI tests in `ConcurrentCameraTest` by combining navigations to
the settings screen, reducing test execution times.
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.
Deletes the concurrent camera quick setting in anticipation of a quick settings UI refactor wherein it is removed. The concurrent camerea setting has been made available in the main settings screen.