Skip to content

Add isCameraRunning state #425

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.

Sign up for GitHub

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 15 commits into
base: main
Choose a base branch
from
Open

Add isCameraRunning state #425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
dfb50e4
Increase test timeouts for API 28 emulators
temcguir Jan 14, 2026
3494bdf
Update tests to use common timeouts rather than `waitUntil` directly
temcguir Jan 14, 2026
0090aed
Update style guide with some guidance on timeouts in tests
temcguir Jan 14, 2026
0787e1a
Add isCameraRunning state
temcguir Nov 11, 2025
0e9aa1b
Update more tests to use `waitForCaptureButton`
temcguir Jan 14, 2026
74fd572
Move visually debounced button state into its own `remember` hook
temcguir Nov 11, 2025
c1db907
Rename CaptureButtonUiState.Enabled to "Available"
temcguir Jan 12, 2026
4833dac
Add isEnabled property to CaptureButtonUiState to control button inte…
temcguir Jan 12, 2026
db5fdbf
Add documentation to CaptureButtonUiState
temcguir Jan 12, 2026
728a5cf
Add new test for CaptureButtonUiStateAdapter
temcguir Jan 13, 2026
1f5bccd
Add new Compose Previews for disabled capture button states
temcguir Jan 13, 2026
a4dea88
Remove repeated logic from `CaptureModeSettingsTest`
temcguir Jan 15, 2026
781b62e
Merge branch 'temcguir/improve_test_flakiness' into temcguir/capture_…
temcguir Jan 15, 2026
c6e9243
Merge branch 'main' into temcguir/capture_button_disabled_state
temcguir Feb 5, 2026
867b443
Merge branch 'main' into temcguir/capture_button_disabled_state
temcguir Feb 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 5 additions & 14 deletions app/src/androidTest/java/com/google/jetpackcamera/BackgroundDeviceTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
package com.google.jetpackcamera

import android.os.Build
import androidx.compose.ui.test.isDisplayed
import androidx.compose.ui.test.junit4.createEmptyComposeRule
import androidx.compose.ui.test.onNodeWithTag
import androidx.compose.ui.test.performClick
Expand All @@ -28,7 +27,6 @@ import androidx.test.uiautomator.UiDevice
import androidx.test.uiautomator.Until
import com.google.common.truth.Truth.assertThat
import com.google.common.truth.TruthJUnit.assume
import com.google.jetpackcamera.ui.components.capture.CAPTURE_BUTTON
import com.google.jetpackcamera.ui.components.capture.QUICK_SETTINGS_DROP_DOWN
import com.google.jetpackcamera.ui.components.capture.QUICK_SETTINGS_FLIP_CAMERA_BUTTON
import com.google.jetpackcamera.ui.components.capture.QUICK_SETTINGS_RATIO_1_1_BUTTON
Expand All @@ -37,6 +35,7 @@ import com.google.jetpackcamera.ui.components.capture.QUICK_SETTINGS_STREAM_CONF
import com.google.jetpackcamera.utils.APP_START_TIMEOUT_MILLIS
import com.google.jetpackcamera.utils.TEST_REQUIRED_PERMISSIONS
import com.google.jetpackcamera.utils.runMainActivityScenarioTest
import com.google.jetpackcamera.utils.waitForCaptureButton
import org.junit.Before
import org.junit.Rule
import org.junit.Test
Expand Down Expand Up @@ -74,19 +73,15 @@ class BackgroundDeviceTest {
@Test
fun background_foreground() = runMainActivityScenarioTest {
// Wait for the capture button to be displayed
composeTestRule.waitUntil(timeoutMillis = APP_START_TIMEOUT_MILLIS) {
composeTestRule.onNodeWithTag(CAPTURE_BUTTON).isDisplayed()
}
composeTestRule.waitForCaptureButton()

backgroundThenForegroundApp()
}

@Test
fun flipCamera_then_background_foreground() = runMainActivityScenarioTest {
// Wait for the capture button to be displayed
composeTestRule.waitUntil(timeoutMillis = APP_START_TIMEOUT_MILLIS) {
composeTestRule.onNodeWithTag(CAPTURE_BUTTON).isDisplayed()
}
composeTestRule.waitForCaptureButton()

// Navigate to quick settings
composeTestRule.onNodeWithTag(QUICK_SETTINGS_DROP_DOWN)
Expand All @@ -109,9 +104,7 @@ class BackgroundDeviceTest {
@Test
fun setAspectRatio_then_background_foreground() = runMainActivityScenarioTest {
// Wait for the capture button to be displayed
composeTestRule.waitUntil(timeoutMillis = APP_START_TIMEOUT_MILLIS) {
composeTestRule.onNodeWithTag(CAPTURE_BUTTON).isDisplayed()
}
composeTestRule.waitForCaptureButton()

// Navigate to quick settings
composeTestRule.onNodeWithTag(QUICK_SETTINGS_DROP_DOWN)
Expand Down Expand Up @@ -147,9 +140,7 @@ class BackgroundDeviceTest {
assumeSupportsSingleStream()

// Wait for the capture button to be displayed
composeTestRule.waitUntil(timeoutMillis = APP_START_TIMEOUT_MILLIS) {
composeTestRule.onNodeWithTag(CAPTURE_BUTTON).isDisplayed()
}
composeTestRule.waitForCaptureButton()

// Navigate to quick settings
composeTestRule.onNodeWithTag(QUICK_SETTINGS_DROP_DOWN)
Expand Down
25 changes: 6 additions & 19 deletions app/src/androidTest/java/com/google/jetpackcamera/CachedImageCaptureDeviceTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ import com.google.jetpackcamera.feature.postcapture.ui.VIEWER_POST_CAPTURE_IMAGE
import com.google.jetpackcamera.ui.components.capture.CAPTURE_BUTTON
import com.google.jetpackcamera.ui.components.capture.IMAGE_CAPTURE_FAILURE_TAG
import com.google.jetpackcamera.ui.components.capture.IMAGE_CAPTURE_SUCCESS_TAG
import com.google.jetpackcamera.utils.APP_START_TIMEOUT_MILLIS
import com.google.jetpackcamera.utils.IMAGE_CAPTURE_TIMEOUT_MILLIS
import com.google.jetpackcamera.utils.IMAGE_PREFIX
import com.google.jetpackcamera.utils.MESSAGE_DISAPPEAR_TIMEOUT_MILLIS
Expand Down Expand Up @@ -101,9 +100,7 @@ class CachedImageCaptureDeviceTest {
cacheExtra
) {
// Wait for the capture button to be displayed
composeTestRule.waitUntil(timeoutMillis = APP_START_TIMEOUT_MILLIS) {
composeTestRule.onNodeWithTag(CAPTURE_BUTTON).isDisplayed()
}
composeTestRule.waitForCaptureButton()

composeTestRule.onNodeWithTag(CAPTURE_BUTTON)
.assertExists()
Expand All @@ -127,9 +124,7 @@ class CachedImageCaptureDeviceTest {
cacheExtra
) {
// Wait for the capture button to be displayed
composeTestRule.waitUntil(timeoutMillis = APP_START_TIMEOUT_MILLIS) {
composeTestRule.onNodeWithTag(CAPTURE_BUTTON).isDisplayed()
}
composeTestRule.waitForCaptureButton()

composeTestRule.onNodeWithTag(CAPTURE_BUTTON)
.assertExists()
Expand Down Expand Up @@ -162,9 +157,7 @@ class CachedImageCaptureDeviceTest {
cacheExtra
) {
// Wait for the capture button to be displayed
composeTestRule.waitUntil(timeoutMillis = APP_START_TIMEOUT_MILLIS) {
composeTestRule.onNodeWithTag(CAPTURE_BUTTON).isDisplayed()
}
composeTestRule.waitForCaptureButton()
repeat(2) {
clickCaptureAndWaitUntilMessageDisappears(
IMAGE_CAPTURE_TIMEOUT_MILLIS,
Expand All @@ -191,9 +184,7 @@ class CachedImageCaptureDeviceTest {
cacheExtra
) {
// Wait for the capture button to be displayed
composeTestRule.waitUntil(timeoutMillis = APP_START_TIMEOUT_MILLIS) {
composeTestRule.onNodeWithTag(CAPTURE_BUTTON).isDisplayed()
}
composeTestRule.waitForCaptureButton()
repeat(2) {
clickCaptureAndWaitUntilMessageDisappears(
IMAGE_CAPTURE_TIMEOUT_MILLIS,
Expand All @@ -219,9 +210,7 @@ class CachedImageCaptureDeviceTest {
cacheExtra
) {
// Wait for the capture button to be displayed
composeTestRule.waitUntil(timeoutMillis = APP_START_TIMEOUT_MILLIS) {
composeTestRule.onNodeWithTag(CAPTURE_BUTTON).isDisplayed()
}
composeTestRule.waitForCaptureButton()
uiDevice.pressBack()
}
Truth.assertThat(result.resultCode).isEqualTo(Activity.RESULT_CANCELED)
Expand All @@ -242,9 +231,7 @@ class CachedImageCaptureDeviceTest {
cacheExtra
) {
// Wait for the capture button to be displayed
composeTestRule.waitUntil(timeoutMillis = APP_START_TIMEOUT_MILLIS) {
composeTestRule.onNodeWithTag(CAPTURE_BUTTON).isDisplayed()
}
composeTestRule.waitForCaptureButton()
clickCaptureAndWaitUntilMessageDisappears(
IMAGE_CAPTURE_TIMEOUT_MILLIS,
IMAGE_CAPTURE_FAILURE_TAG
Expand Down
11 changes: 2 additions & 9 deletions app/src/androidTest/java/com/google/jetpackcamera/CachedVideoRecordingDeviceTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ package com.google.jetpackcamera
import android.app.Activity
import android.net.Uri
import android.provider.MediaStore
import androidx.compose.ui.test.isDisplayed
import androidx.compose.ui.test.junit4.createEmptyComposeRule
import androidx.compose.ui.test.onNodeWithTag
import androidx.compose.ui.test.performClick
Expand All @@ -29,9 +28,7 @@ import androidx.test.uiautomator.UiDevice
import com.google.common.truth.Truth
import com.google.jetpackcamera.feature.postcapture.ui.BUTTON_POST_CAPTURE_EXIT
import com.google.jetpackcamera.feature.postcapture.ui.VIEWER_POST_CAPTURE_VIDEO
import com.google.jetpackcamera.ui.components.capture.CAPTURE_BUTTON
import com.google.jetpackcamera.ui.components.capture.VIDEO_CAPTURE_FAILURE_TAG
import com.google.jetpackcamera.utils.APP_START_TIMEOUT_MILLIS
import com.google.jetpackcamera.utils.MOVIES_DIR_PATH
import com.google.jetpackcamera.utils.TEST_REQUIRED_PERMISSIONS
import com.google.jetpackcamera.utils.VIDEO_CAPTURE_TIMEOUT_MILLIS
Expand Down Expand Up @@ -92,9 +89,7 @@ class CachedVideoRecordingDeviceTest {
cacheExtra
) {
// Wait for the capture button to be displayed
composeTestRule.waitUntil(timeoutMillis = APP_START_TIMEOUT_MILLIS) {
composeTestRule.onNodeWithTag(CAPTURE_BUTTON).isDisplayed()
}
composeTestRule.waitForCaptureButton()
composeTestRule.longClickForVideoRecordingCheckingElapsedTime()
}
Truth.assertThat(result.resultCode).isEqualTo(Activity.RESULT_OK)
Expand All @@ -110,9 +105,7 @@ class CachedVideoRecordingDeviceTest {
getSingleImageCaptureIntent(uri, MediaStore.ACTION_VIDEO_CAPTURE)
) {
// Wait for the capture button to be displayed
composeTestRule.waitUntil(timeoutMillis = APP_START_TIMEOUT_MILLIS) {
composeTestRule.onNodeWithTag(CAPTURE_BUTTON).isDisplayed()
}
composeTestRule.waitForCaptureButton()
composeTestRule.longClickForVideoRecording()
composeTestRule.waitForNodeWithTag(
VIDEO_CAPTURE_FAILURE_TAG,
Expand Down
31 changes: 8 additions & 23 deletions app/src/androidTest/java/com/google/jetpackcamera/FlashDeviceTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ package com.google.jetpackcamera

import android.os.Build
import android.provider.MediaStore
import androidx.compose.ui.test.isDisplayed
import androidx.compose.ui.test.isEnabled
import androidx.compose.ui.test.junit4.createEmptyComposeRule
import androidx.compose.ui.test.onNodeWithTag
Expand All @@ -35,7 +34,6 @@ import com.google.jetpackcamera.ui.components.capture.FLIP_CAMERA_BUTTON
import com.google.jetpackcamera.ui.components.capture.IMAGE_CAPTURE_SUCCESS_TAG
import com.google.jetpackcamera.ui.components.capture.SCREEN_FLASH_OVERLAY
import com.google.jetpackcamera.ui.components.capture.VIDEO_CAPTURE_SUCCESS_TAG
import com.google.jetpackcamera.utils.APP_START_TIMEOUT_MILLIS
import com.google.jetpackcamera.utils.IMAGE_CAPTURE_TIMEOUT_MILLIS
import com.google.jetpackcamera.utils.SCREEN_FLASH_OVERLAY_TIMEOUT_MILLIS
import com.google.jetpackcamera.utils.TEST_REQUIRED_PERMISSIONS
Expand All @@ -46,6 +44,7 @@ import com.google.jetpackcamera.utils.longClickForVideoRecordingCheckingElapsedT
import com.google.jetpackcamera.utils.runMainActivityMediaStoreAutoDeleteScenarioTest
import com.google.jetpackcamera.utils.runMainActivityScenarioTest
import com.google.jetpackcamera.utils.setFlashMode
import com.google.jetpackcamera.utils.waitForCaptureButton
import com.google.jetpackcamera.utils.waitForNodeWithTag
import org.junit.Before
import org.junit.Rule
Expand All @@ -72,39 +71,31 @@ internal class FlashDeviceTest {
@Test
fun set_flash_on() = runMainActivityScenarioTest {
// Wait for the capture button to be displayed
composeTestRule.waitUntil(timeoutMillis = APP_START_TIMEOUT_MILLIS) {
composeTestRule.onNodeWithTag(CAPTURE_BUTTON).isDisplayed()
}
composeTestRule.waitForCaptureButton()

composeTestRule.setFlashMode(FlashMode.ON)
}

@Test
fun set_flash_auto() = runMainActivityScenarioTest {
// Wait for the capture button to be displayed
composeTestRule.waitUntil(timeoutMillis = APP_START_TIMEOUT_MILLIS) {
composeTestRule.onNodeWithTag(CAPTURE_BUTTON).isDisplayed()
}
composeTestRule.waitForCaptureButton()

composeTestRule.setFlashMode(FlashMode.AUTO)
}

@Test
fun set_flash_off() = runMainActivityScenarioTest {
// Wait for the capture button to be displayed
composeTestRule.waitUntil(timeoutMillis = APP_START_TIMEOUT_MILLIS) {
composeTestRule.onNodeWithTag(CAPTURE_BUTTON).isDisplayed()
}
composeTestRule.waitForCaptureButton()

composeTestRule.setFlashMode(FlashMode.OFF)
}

@Test
fun set_flash_low_light_boost() = runMainActivityScenarioTest {
// Wait for the capture button to be displayed
composeTestRule.waitUntil(timeoutMillis = APP_START_TIMEOUT_MILLIS) {
composeTestRule.onNodeWithTag(CAPTURE_BUTTON).isDisplayed()
}
composeTestRule.waitForCaptureButton()

composeTestRule.setFlashMode(FlashMode.LOW_LIGHT_BOOST)
}
Expand All @@ -124,9 +115,7 @@ internal class FlashDeviceTest {
assumeHalStableOnImageCapture()

// Wait for the capture button to be displayed
composeTestRule.waitUntil(timeoutMillis = APP_START_TIMEOUT_MILLIS) {
composeTestRule.onNodeWithTag(CAPTURE_BUTTON).isDisplayed()
}
composeTestRule.waitForCaptureButton()

// Ensure camera has a back camera and flip to it
val lensFacing = composeTestRule.getCurrentLensFacing()
Expand All @@ -152,9 +141,7 @@ internal class FlashDeviceTest {
filePrefix = "JCA"
) {
// Wait for the capture button to be displayed
composeTestRule.waitUntil(timeoutMillis = APP_START_TIMEOUT_MILLIS) {
composeTestRule.onNodeWithTag(CAPTURE_BUTTON).isDisplayed()
}
composeTestRule.waitForCaptureButton()

// Ensure camera has a front camera and flip to it
val lensFacing = composeTestRule.getCurrentLensFacing()
Expand Down Expand Up @@ -195,9 +182,7 @@ internal class FlashDeviceTest {
mediaUri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI
) {
// Wait for the capture button to be displayed
composeTestRule.waitUntil(timeoutMillis = APP_START_TIMEOUT_MILLIS) {
composeTestRule.onNodeWithTag(CAPTURE_BUTTON).isDisplayed()
}
composeTestRule.waitForCaptureButton()

// Ensure camera has the target lens facing camera and flip to it
val lensFacing = composeTestRule.getCurrentLensFacing()
Expand Down
Loading
Loading