Skip to content

[pull] androidx-main from androidx:androidx-main #737

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

Merged
pull merged 4 commits into from
Jan 13, 2026
Merged

[pull] androidx-main from androidx:androidx-main #737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
96e3707
Avoid unnecessary torch reset in TorchControl
Zeronfinity Jan 5, 2026
804e76f
[ObjectEraser] Fix Highlight Object Eraser Bug.
Jan 12, 2026
98924d6
Merge "Avoid unnecessary torch reset in TorchControl" into androidx-main
Jan 13, 2026
32585c2
Merge "[ObjectEraser] Fix Highlight Object Eraser Bug." into androidx…
Jan 13, 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
8 changes: 5 additions & 3 deletions ...e-integration/src/main/java/androidx/camera/camera2/pipe/integration/impl/TorchControl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,12 @@ constructor(
}

override fun reset() {
updateTorchState(TorchMode.OFF)
stopRunningTaskInternal()
setTorchAsync(false)
torchMode = null
if (torchMode != null) {
updateTorchState(TorchMode.OFF)
setTorchAsync(false)
torchMode = null
}
}

private val hasFlashUnit: Boolean = cameraProperties.isFlashAvailable()
Expand Down
8 changes: 5 additions & 3 deletions camera/camera-camera2/src/main/java/androidx/camera/camera2/impl/TorchControl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,12 @@ constructor(
}

override fun reset() {
updateTorchState(TorchMode.OFF)
stopRunningTaskInternal()
setTorchAsync(false)
torchMode = null
if (torchMode != null) {
updateTorchState(TorchMode.OFF)
setTorchAsync(false)
torchMode = null
}
}

private val hasFlashUnit: Boolean = cameraProperties.isFlashAvailable()
Expand Down
87 changes: 57 additions & 30 deletions ...wer/src/androidTest/kotlin/androidx/pdf/annotation/AnnotationSelectionTouchHandlerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,9 @@ class AnnotationSelectionTouchHandlerTest {
viewX: Float,
viewY: Float,
): PageInfoProvider.PageInfo {
val pageBounds = RectF(0f, 0f, PAGE_WIDTH, PAGE_HEIGHT)
return PageInfoProvider.PageInfo(
pageNum = 0,
pageBounds = pageBounds,
pageBounds = RectF(0f, 0f, PAGE_WIDTH, PAGE_HEIGHT),
pageToViewTransform = Matrix(),
viewToPageTransform = Matrix(),
)
Expand All @@ -91,13 +90,12 @@ class AnnotationSelectionTouchHandlerTest {
@Test
fun handleTouchEvent_hitDetected_notifiesListener() {
ActivityScenario.launch(PdfViewTestActivity::class.java).use { scenario ->
val annotationBounds = RectF(100f, 100f, 200f, 200f)
val annotation = createStampAnnotation(annotationBounds)
val annotation = createStampAnnotation()

scenario.onActivity {
setupAnnotationsOnView(listOf(annotation))

// Simulate Touch inside bounds
// Touch at (150, 150) is inside the first path (125, 125 to 175, 175)
val event = obtainMotionEvent(MotionEvent.ACTION_DOWN, 150f, 150f)
val consumed = selectionTouchHandler.handleTouch(annotationsView, event)

Expand All @@ -110,13 +108,12 @@ class AnnotationSelectionTouchHandlerTest {
@Test
fun handleTouchEvent_outsideBounds_returnsFalse() {
ActivityScenario.launch(PdfViewTestActivity::class.java).use { scenario ->
val annotationBounds = RectF(100f, 100f, 200f, 200f)
val annotation = createStampAnnotation(annotationBounds)
val annotation = createStampAnnotation()

scenario.onActivity {
setupAnnotationsOnView(listOf(annotation))

// Touch outside at (300, 300)
// Touch at (300, 300) is outside the 100-200 bounds
val event = obtainMotionEvent(MotionEvent.ACTION_DOWN, 300f, 300f)
val consumed = selectionTouchHandler.handleTouch(annotationsView, event)

Expand All @@ -129,8 +126,7 @@ class AnnotationSelectionTouchHandlerTest {
@Test
fun handleTouchEvent_swipeGesture_hitDetected() {
ActivityScenario.launch(PdfViewTestActivity::class.java).use { scenario ->
val annotationBounds = RectF(100f, 100f, 200f, 200f)
val annotation = createStampAnnotation(annotationBounds)
val annotation = createStampAnnotation()

scenario.onActivity {
setupAnnotationsOnView(listOf(annotation))
Expand All @@ -148,11 +144,8 @@ class AnnotationSelectionTouchHandlerTest {
@Test
fun handleTouchEvent_overlappingAnnotations_selectsTopMost() {
ActivityScenario.launch(PdfViewTestActivity::class.java).use { scenario ->
// Both annotations share the same bounds
val bounds = RectF(100f, 100f, 200f, 200f)
val bounds1 = RectF(125f, 125f, 175f, 175f)
val bottomAnnotation = createStampAnnotation(bounds)
val topAnnotation = createStampAnnotation(bounds1)
val bottomAnnotation = createStampAnnotation()
val topAnnotation = createStampAnnotation(10f)

scenario.onActivity {
// The list order represents Z-order: index 0 is bottom, last index is top
Expand All @@ -170,7 +163,24 @@ class AnnotationSelectionTouchHandlerTest {
}
}

// Updated helper to support multiple annotations
@Test
fun handleTouchEvent_hitDetectedOnSecondPath_notifiesListener() {
ActivityScenario.launch(PdfViewTestActivity::class.java).use { scenario ->
val annotation = createStampAnnotation()

scenario.onActivity {
setupAnnotationsOnView(listOf(annotation))

// Touch at (150, 190) is inside the second path (125, 180 to 175, 195)
val event = obtainMotionEvent(MotionEvent.ACTION_DOWN, 150f, 190f)
val consumed = selectionTouchHandler.handleTouch(annotationsView, event)

assertThat(consumed).isTrue()
assertThat(testListener.lastSelectedAnnotation).isEqualTo(annotation)
}
}
}

private fun setupAnnotationsOnView(annotations: List<PdfAnnotation>) {
val keyedAnnotations =
annotations.map { KeyedPdfAnnotation(key = UUID.randomUUID().toString(), it) }
Expand All @@ -180,22 +190,39 @@ class AnnotationSelectionTouchHandlerTest {
annotationsView.annotations = sparseArray
}

private fun createStampAnnotation(bounds: RectF): StampAnnotation {
val width = bounds.width()
val height = bounds.height()

// Mock a simple rectangular path slightly inset from bounds
val pathInputs =
listOf(
PathPdfObject.PathInput(bounds.left + width / 4, bounds.top + height / 4),
PathPdfObject.PathInput(bounds.right - width / 4, bounds.top + height / 4),
PathPdfObject.PathInput(bounds.right - width / 4, bounds.bottom - height / 4),
PathPdfObject.PathInput(bounds.left + width / 4, bounds.bottom - height / 4),
PathPdfObject.PathInput(bounds.left + width / 4, bounds.top + height / 4),
/**
* Creates a StampAnnotation with hard-coded bounds and paths for predictable testing. Overall
* Bounds: (100, 100, 200, 200) Path 1 (Square): (125, 125) to (175, 175) Path 2 (Rectangle):
* (125, 180) to (175, 195)
*/
private fun createStampAnnotation(offset: Float = 0f): StampAnnotation {
val bounds = RectF(100f + offset, 100f + offset, 200f + offset, 200f + offset)

val path1 =
PathPdfObject(
Color.RED,
0f,
listOf(
PathPdfObject.PathInput(125f, 125f),
PathPdfObject.PathInput(175f, 125f),
PathPdfObject.PathInput(175f, 175f),
PathPdfObject.PathInput(125f, 175f),
),
)

val path2 =
PathPdfObject(
Color.BLUE,
0f,
listOf(
PathPdfObject.PathInput(125f, 180f),
PathPdfObject.PathInput(175f, 180f),
PathPdfObject.PathInput(175f, 195f),
PathPdfObject.PathInput(125f, 195f),
),
)

val pathObject = PathPdfObject(Color.RED, 10f, pathInputs)
return StampAnnotation(0, bounds, listOf(pathObject))
return StampAnnotation(0, bounds, listOf(path1, path2))
}

private fun obtainMotionEvent(action: Int, x: Float, y: Float): MotionEvent {
Expand Down
4 changes: 3 additions & 1 deletion pdf/pdf-viewer/src/main/kotlin/androidx/pdf/annotation/AnnotationSelectionTouchHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,9 @@ internal class AnnotationSelectionTouchHandler() {
pathRegion.setPath(path, clip)

// Intersect the path region with our touch square region.
return pathRegion.op(touchRegion, Region.Op.INTERSECT)
if (pathRegion.op(touchRegion, Region.Op.INTERSECT) == true) {
return true
}
}
false
}
Expand Down
Loading