-
Notifications
You must be signed in to change notification settings - Fork 63
Configurable Elapsed Time Updates in CaptureUiStateAdapter #514
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
temcguir
wants to merge
18
commits into
main
Choose a base branch
from
temcguir/state_conflation
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+103
−16
Open
Changes from all commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
bdcc2f0
Fix intent extras merging and usage in VideoRecordingDeviceTest
temcguir a996449
Round elapsedTimeNanos to nearest second in CaptureUiStateAdapter
temcguir 385de58
feat: make elapsed time rounding configurable in CaptureUiStateAdapte…
temcguir 55a1364
test: add unit tests for CaptureUiStateAdapter rounding
temcguir d4ae74f
docs: add state conflation guideline to styleguide
temcguir 25844e9
refactor: apply review comments to simplify rounding and avoid redund…
temcguir 282d848
refactor: apply remaining review comments
temcguir b6fd9fe
refactor: move roundedCameraState definition to match bot suggestion
temcguir cf32cfa
docs: add timePrecision parameter to captureUiState KDoc
temcguir 8bdc11f
docs: add KDocs to modified test helper functions in UiTestUtil
temcguir 8e5adf6
Merge remote-tracking branch 'origin/main' into temcguir/state_confla…
temcguir 8135752
Apply spotless formatting
temcguir 72f6888
Resolve PR 514 comments: skip rounding if NANOSECONDS, add test for p…
temcguir 69ef5d5
Apply spotless formatting to PR 514
temcguir b17cf34
Merge branch 'main' into temcguir/state_conflation
temcguir 4859361
Refine VideoRecordingState rounding logic and remove intent extras te…
temcguir 9f54155
Apply spotless formatting
temcguir 1b581b7
Use roundedCameraState for sessionFirstFrameTimestamp
temcguir File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
56 changes: 56 additions & 0 deletions
56
...test/java/com/google/jetpackcamera/ui/uistateadapter/capture/CaptureUiStateAdapterTest.kt
|
temcguir marked this conversation as resolved.
|
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| /* | ||
| * Copyright (C) 2026 The Android Open Source Project | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.google.jetpackcamera.ui.uistateadapter.capture | ||
|
|
||
| import com.google.common.truth.Truth.assertThat | ||
| import com.google.jetpackcamera.core.camera.VideoRecordingState | ||
| import com.google.jetpackcamera.ui.uistateadapter.capture.compound.roundVideoRecordingState | ||
| import java.util.concurrent.TimeUnit | ||
| import org.junit.Test | ||
| import org.junit.runner.RunWith | ||
| import org.junit.runners.JUnit4 | ||
|
|
||
| @RunWith(JUnit4::class) | ||
| class CaptureUiStateAdapterTest { | ||
|
|
||
| @Test | ||
| fun roundVideoRecordingState_nanoseconds_noRounding() { | ||
| val state = VideoRecordingState.Active.Recording(0L, 0.0, 1234567890L) | ||
| val rounded = roundVideoRecordingState(state, TimeUnit.NANOSECONDS) | ||
| assertThat((rounded as VideoRecordingState.Active).elapsedTimeNanos).isEqualTo(1234567890L) | ||
| } | ||
|
|
||
| @Test | ||
| fun roundVideoRecordingState_milliseconds_roundsToMillis() { | ||
| val state = VideoRecordingState.Active.Recording(0L, 0.0, 1234567890L) | ||
| val rounded = roundVideoRecordingState(state, TimeUnit.MILLISECONDS) | ||
| assertThat((rounded as VideoRecordingState.Active).elapsedTimeNanos).isEqualTo(1234000000L) | ||
| } | ||
|
|
||
| @Test | ||
| fun roundVideoRecordingState_seconds_roundsToSeconds() { | ||
| val state = VideoRecordingState.Active.Recording(0L, 0.0, 1234567890L) | ||
| val rounded = roundVideoRecordingState(state, TimeUnit.SECONDS) | ||
| assertThat((rounded as VideoRecordingState.Active).elapsedTimeNanos).isEqualTo(1000000000L) | ||
| } | ||
|
|
||
| @Test | ||
| fun roundVideoRecordingState_pausedState_roundsToSeconds() { | ||
| val state = VideoRecordingState.Active.Paused(0L, 0.0, 1234567890L) | ||
| val rounded = roundVideoRecordingState(state, TimeUnit.SECONDS) | ||
| assertThat((rounded as VideoRecordingState.Active).elapsedTimeNanos).isEqualTo(1000000000L) | ||
| } | ||
| } |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.