Skip to content

CircleToSearch with multi search engine support for all android

Kotlin

feat: translate feature using assistant permission only

AKS Labsd3ce6d1792be
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index dff28b0..ecf8eba 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
<selectionStates>
<SelectionState runConfigName="app">
<option name="selectionMode" value="DROPDOWN" />
- <DropdownSelection timestamp="2026-10-10T05:47:22.124172800Z">
+ <DropdownSelection timestamp="2026-10-12T07:59:53.459130300Z">
<Target type="DEFAULT_BOOT">
<handle>
- <DeviceId pluginId="PhysicalDevice" identifier="serial=9c872922" />
+ <DeviceId pluginId="Wireless" identifier="serviceName=adb-9c872922-KLor6Z (2)" />
</handle>
</Target>
</DropdownSelection>
diff --git a/OCR-translation/src/main/java/dev/davidv/translator/accessibilityOverlay/OverlayUI.kt b/OCR-translation/src/main/java/dev/davidv/translator/accessibilityOverlay/OverlayUI.kt
index 643b1f9..7c9d275 100644
--- a/OCR-translation/src/main/java/dev/davidv/translator/accessibilityOverlay/OverlayUI.kt
+++ b/OCR-translation/src/main/java/dev/davidv/translator/accessibilityOverlay/OverlayUI.kt
@@ -40,7 +40,30 @@ class OverlayUI(
private val serviceContext: Context,
private val windowManager: WindowManager,
private val settingsManager: SettingsManager,
+ private val windowTypeOverride: Int? = null,
+ private val container: android.view.ViewGroup? = null,
) {
+ private fun windowType(): Int =
+ windowTypeOverride ?: WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAY
+
+ /** Adds a chrome view: to the in-activity container when hosted by our overlay activity
+ * (which is already a full-screen window, so no separate overlay window is needed), or
+ * to the WindowManager when running in the accessibility service. */
+ private fun addChromeView(view: View, lp: android.view.ViewGroup.LayoutParams) {
+ if (container != null) {
+ container.addView(view, lp)
+ } else {
+ windowManager.addView(view, lp as WindowManager.LayoutParams)
+ }
+ }
+
+ private fun removeChromeView(view: View) {
+ if (container != null) {
+ container.removeView(view)
+ } else {
+ windowManager.removeView(view)
+ }
+ }
private val handler = Handler(Looper.getMainLooper())
private var launcherBubble: FloatingBubble? = null
private var toolbarView: View? = null
@@ -58,6 +81,7 @@ class OverlayUI(
private var borderView: BorderWaveView? = null
private var selectDialog: Dialog? = null
private var selectHost: WindowComposeHost? = null
+ private var selectSurfaceView: View? = null
private var scanHost: WindowComposeHost? = null
private var messageView: TextView? = null
private val menuChildren = mutableListOf<View>()
@@ -68,54 +92,76 @@ class OverlayUI(
::dpToPx,
object : OverlayMenuHost {
override fun addDismissLayer(view: View) {
- val params =
- WindowManager.LayoutParams(
- WindowManager.LayoutParams.MATCH_PARENT,
- WindowManager.LayoutParams.MATCH_PARENT,
- WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAY,
- WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN,
- PixelFormat.TRANSLUCENT,
- )
- params.windowAnimations = 0
- windowManager.addView(view, params)
+ val lp =
+ if (container != null) {
+ android.widget.FrameLayout.LayoutParams(
+ android.view.ViewGroup.LayoutParams.MATCH_PARENT,
+ android.view.ViewGroup.LayoutParams.MATCH_PARENT,
+ )
+ } else {
+ WindowManager.LayoutParams(
+ WindowManager.LayoutParams.MATCH_PARENT,
+ WindowManager.LayoutParams.MATCH_PARENT,
+ windowType(),
+ WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN,
+ PixelFormat.TRANSLUCENT,
+ ).apply { windowAnimations = 0 }
+ }
+ addChromeView(view, lp)
menuChildren.add(view)
}
override fun addMenuView(view: View) {
- val params =
- WindowManager.LayoutParams(
- dpToPx(180),
- WindowManager.LayoutParams.WRAP_CONTENT,
- WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAY,
- WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
- PixelFormat.TRANSLUCENT,
- )
- params.gravity = Gravity.TOP or Gravity.END
- params.x = dpToPx(8)
- params.y = dpToPx(48)
- params.windowAnimations = 0
- windowManager.addView(view, params)
+ val lp =
+ if (container != null) {
+ android.widget.FrameLayout.LayoutParams(dpToPx(180), android.view.ViewGroup.LayoutParams.WRAP_CONTENT).apply {
+ gravity = Gravity.TOP or Gravity.END
+ topMargin = dpToPx(48)
+ marginEnd = dpToPx(8)
+ }
+ } else {
+ WindowManager.LayoutParams(
+ dpToPx(180),
+ WindowManager.LayoutParams.WRAP_CONTENT,
+ windowType(),
+ WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
+ PixelFormat.TRANSLUCENT,
+ ).apply {
+ gravity = Gravity.TOP or Gravity.END
+ x = dpToPx(8)
+ y = dpToPx(48)
+ windowAnimations = 0
+ }
+ }
+ addChromeView(view, lp)
menuChildren.add(view)
}
override fun addPickerView(view: View) {
- val params =
- WindowManager.LayoutParams(
- dpToPx(250),
- dpToPx(400),
- WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAY,
- WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
- PixelFormat.TRANSLUCENT,
- )
- params.gravity = Gravity.CENTER
- params.windowAnimations = 0
- windowManager.addView(view, params)
+ val lp =
+ if (container != null) {
+ android.widget.FrameLayout.LayoutParams(dpToPx(250), dpToPx(400)).apply {
+ gravity = Gravity.CENTER
+ }
+ } else {
+ WindowManager.LayoutParams(
+ dpToPx(250),
+ dpToPx(400),
+ windowType(),
+ WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
+ PixelFormat.TRANSLUCENT,
+ ).apply {
+ gravity = Gravity.CENTER
+ windowAnimations = 0
+ }
+ }
+ addChromeView(view, lp)
menuChildren.add(view)
}
override fun removeMenuChild(view: View) {
menuChildren.remove(view)
- windowManager.removeView(view)
+ removeChromeView(view)
}
},
)
@@ -124,7 +170,7 @@ class OverlayUI(
val bubble = launcherBubble
if (bubble == null) {
launcherBubble =
- FloatingBubble(serviceContext, windowManager, WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAY, ::dpToPx) {
+ FloatingBubble(serviceContext, windowManager, windowType(), ::dpToPx) {
service.activate()
}.also { it.show() }
} else {
@@ -179,27 +225,35 @@ class OverlayUI(
flipIconView = toolbarViews.flipIcon
flipButtonView?.visibility = View.GONE
- val params =
- WindowManager.LayoutParams(
- WindowManager.LayoutParams.MATCH_PARENT,
- WindowManager.LayoutParams.WRAP_CONTENT,
- WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAY,
- WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN,
- PixelFormat.TRANSLUCENT,
- )
- params.gravity = Gravity.TOP or Gravity.START
- params.x = 0
- params.y = getStatusBarHeight()
- params.windowAnimations = 0
+ val lp: android.view.ViewGroup.LayoutParams =
+ if (container != null) {
+ android.widget.FrameLayout.LayoutParams(
+ android.view.ViewGroup.LayoutParams.MATCH_PARENT,
+ android.view.ViewGroup.LayoutParams.WRAP_CONTENT,
+ ).apply { topMargin = getStatusBarHeight() }
+ } else {
+ WindowManager.LayoutParams(
+ WindowManager.LayoutParams.MATCH_PARENT,
+ WindowManager.LayoutParams.WRAP_CONTENT,
+ windowType(),
+ WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN,
+ PixelFormat.TRANSLUCENT,
+ ).apply {
+ gravity = Gravity.TOP or Gravity.START
+ x = 0
+ y = getStatusBarHeight()
+ windowAnimations = 0
+ }
+ }
- windowManager.addView(toolbar, params)
+ addChromeView(toolbar, lp)
toolbarView = toolbar
- toolbarParams = params
+ toolbarParams = lp as? WindowManager.LayoutParams
}
fun removeToolbar() {
toolbarView?.let {
- windowManager.removeView(it)
+ removeChromeView(it)
toolbarView = null
toolbarParams = null
sourceLabelView = null
@@ -283,22 +337,30 @@ class OverlayUI(
// Non-touchable so taps and swipes pass straight through to the app underneath;
// the overlay clears itself off the next scroll/click via onAccessibilityEvent.
- val params =
- WindowManager.LayoutParams(
- bounds.width(),
- bounds.height(),
- WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAY,
- WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or
- WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE or
- WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN,
- PixelFormat.TRANSLUCENT,
- )
- params.gravity = Gravity.TOP or Gravity.START
- params.x = bounds.left
- params.y = bounds.top
- params.spanFullDisplay()
+ val lp: android.view.ViewGroup.LayoutParams =
+ if (container != null) {
+ android.widget.FrameLayout.LayoutParams(bounds.width(), bounds.height()).apply {
+ leftMargin = bounds.left
+ topMargin = bounds.top
+ }
+ } else {
+ WindowManager.LayoutParams(
+ bounds.width(),
+ bounds.height(),
+ windowType(),
+ WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or
+ WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE or
+ WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN,
+ PixelFormat.TRANSLUCENT,
+ ).apply {
+ gravity = Gravity.TOP or Gravity.START
+ x = bounds.left
+ y = bounds.top
+ spanFullDisplay()
+ }
+ }
- windowManager.addView(imageView, params)
+ addChromeView(imageView, lp)
translationOverlays.add(imageView)
raiseToolbar()
ensureTouchWatcher()
@@ -316,46 +378,66 @@ class OverlayUI(
region: Rect,
onDismiss: () -> Unit,
) {
- if (selectDialog != null) return
- val dialog = Dialog(serviceContext, android.R.style.Theme_Material_NoActionBar)
- val host = WindowComposeHost(serviceContext)
- host.setContent { SelectionSurface(state) }
- dialog.setContentView(host.view)
- dialog.setCanceledOnTouchOutside(false)
- dialog.window?.apply {
- setType(WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAY)
- addFlags(
- WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL or
- WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN,
- )
- clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND)
- setWindowAnimations(0)
- setGravity(Gravity.TOP or Gravity.START)
- attributes =
- attributes.apply {
- x = region.left
- y = region.top
- width = region.width()
- height = region.height()
- spanFullDisplay()
- }
- decorView.setPadding(0, 0, 0, 0)
- host.installOn(decorView)
+ if (container != null) {
+ // In-activity hosting: the selection surface is a child view, not a dialog window
+ // (no SYSTEM_ALERT_WINDOW / a11y overlay window type is available to us).
+ val host = WindowComposeHost(serviceContext)
+ host.setContent { SelectionSurface(state) }
+ val lp = android.widget.FrameLayout.LayoutParams(region.width(), region.height()).apply {
+ leftMargin = region.left
+ topMargin = region.top
+ }
+ container.addView(host.view, lp)
+ selectHost = host
+ selectSurfaceView = host.view
+ host.view.setOnClickListener { onDismiss() }
+ } else {
+ val dialog = Dialog(serviceContext, android.R.style.Theme_Material_NoActionBar)
+ val host = WindowComposeHost(serviceContext)
+ host.setContent { SelectionSurface(state) }
+ dialog.setContentView(host.view)
+ dialog.setCanceledOnTouchOutside(false)
+ dialog.window?.apply {
+ setType(windowType())
+ addFlags(
+ WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL or
+ WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN,
+ )
+ clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND)
+ setWindowAnimations(0)
+ setGravity(Gravity.TOP or Gravity.START)
+ attributes =
+ attributes.apply {
+ x = region.left
+ y = region.top
+ width = region.width()
+ height = region.height()
+ spanFullDisplay()
+ }
+ decorView.setPadding(0, 0, 0, 0)
+ host.installOn(decorView)
+ }
+ dialog.setOnCancelListener { onDismiss() }
+ dialog.show()
+ selectDialog = dialog
+ selectHost = host
}
- dialog.setOnCancelListener { onDismiss() }
- dialog.show()
- selectDialog = dialog
- selectHost = host
raiseToolbar()
}
fun removeSelectSurface() {
+ selectSurfaceView?.let {
+ container?.removeView(it)
+ selectSurfaceView = null
+ }
+ selectHost?.let {
+ if (selectSurfaceView == null) it.dispose()
+ }
+ selectHost = null
val dialog = selectDialog ?: return
selectDialog = null
dialog.setOnCancelListener(null)
dialog.dismiss()
- selectHost?.dispose()
- selectHost = null
}
fun hasSelectSurface(): Boolean = selectDialog != null
@@ -376,27 +458,32 @@ class OverlayUI(
}
false
}
- val params =
- WindowManager.LayoutParams(
- 1,
- 1,
- WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAY,
- WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or
- WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL or
- WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH or
- WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN,
- PixelFormat.TRANSLUCENT,
- )
- params.gravity = Gravity.TOP or Gravity.START
- params.windowAnimations = 0
- windowManager.addView(watcher, params)
+ val lp: android.view.ViewGroup.LayoutParams =
+ if (container != null) {
+ android.widget.FrameLayout.LayoutParams(1, 1)
+ } else {
+ WindowManager.LayoutParams(
+ 1,
+ 1,
+ windowType(),
+ WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or
+ WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL or
+ WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH or
+ WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN,
+ PixelFormat.TRANSLUCENT,
+ ).apply {
+ gravity = Gravity.TOP or Gravity.START
+ windowAnimations = 0
+ }
+ }
+ addChromeView(watcher, lp)
touchWatcher = watcher
}
private fun removeTouchWatcher() {
touchWatcher?.let {
try {
- windowManager.removeView(it)
+ if (container != null) container.removeView(it) else windowManager.removeView(it)
} catch (_: Exception) {
}
}
@@ -416,29 +503,37 @@ class OverlayUI(
ScanAnimationOverlay(regions = it, modifier = Modifier.fillMaxSize())
}
}
- val params =
- WindowManager.LayoutParams(
- region.width(),
- region.height(),
- WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAY,
- WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or
- WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE or
- WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN,
- PixelFormat.TRANSLUCENT,
- )
- params.gravity = Gravity.TOP or Gravity.START
- params.x = region.left
- params.y = region.top
- params.spanFullDisplay()
- params.windowAnimations = 0
- windowManager.addView(host.view, params)
+ if (container != null) {
+ val lp = android.widget.FrameLayout.LayoutParams(region.width(), region.height()).apply {
+ leftMargin = region.left
+ topMargin = region.top
+ }
+ container.addView(host.view, lp)
+ } else {
+ val params =
+ WindowManager.LayoutParams(
+ region.width(),
+ region.height(),
+ windowType(),
+ WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or
+ WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE or
+ WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN,
+ PixelFormat.TRANSLUCENT,
+ )
+ params.gravity = Gravity.TOP or Gravity.START
+ params.x = region.left
+ params.y = region.top
+ params.spanFullDisplay()
+ params.windowAnimations = 0
+ windowManager.addView(host.view, params)
+ }
scanHost = host
}
private fun removeScanOverlay() {
scanHost?.let {
try {
- windowManager.removeView(it.view)
+ if (container != null) container.removeView(it.view) else windowManager.removeView(it.view)
} catch (_: Exception) {
}
it.dispose()
@@ -458,23 +553,33 @@ class OverlayUI(
bg.cornerRadius = dpToPx(8).toFloat()
textView.background = bg
- val params =
- WindowManager.LayoutParams(
- WindowManager.LayoutParams.WRAP_CONTENT,
- WindowManager.LayoutParams.WRAP_CONTENT,
- WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAY,
- WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE,
- PixelFormat.TRANSLUCENT,
- )
- params.gravity = Gravity.BOTTOM or Gravity.CENTER_HORIZONTAL
- params.y = dpToPx(80)
-
- windowManager.addView(textView, params)
+ if (container != null) {
+ val lp = android.widget.FrameLayout.LayoutParams(
+ android.view.ViewGroup.LayoutParams.WRAP_CONTENT,
+ android.view.ViewGroup.LayoutParams.WRAP_CONTENT,
+ ).apply {
+ gravity = Gravity.BOTTOM or Gravity.CENTER_HORIZONTAL
+ bottomMargin = dpToPx(80)
+ }
+ container.addView(textView, lp)
+ } else {
+ val params =
+ WindowManager.LayoutParams(
+ WindowManager.LayoutParams.WRAP_CONTENT,
+ WindowManager.LayoutParams.WRAP_CONTENT,
+ windowType(),
+ WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE,
+ PixelFormat.TRANSLUCENT,
+ )
+ params.gravity = Gravity.BOTTOM or Gravity.CENTER_HORIZONTAL
+ params.y = dpToPx(80)
+ windowManager.addView(textView, params)
+ }
messageView = textView
handler.postDelayed({
if (messageView === textView) messageView = null
try {
- windowManager.removeView(textView)
+ if (container != null) container.removeView(textView) else windowManager.removeView(textView)
} catch (_: Exception) {
}
}, 3000)
@@ -502,17 +607,24 @@ class OverlayUI(
* select surface) — windows stack in insertion order. */
private fun raiseToolbar() {
val tv = toolbarView ?: return
- val tp = toolbarParams ?: return
runCatching {
- windowManager.removeView(tv)
- windowManager.addView(tv, tp)
+ if (container != null) {
+ container.removeView(tv)
+ container.addView(tv, tv.layoutParams)
+ } else {
+ // Container mode stores FrameLayout.LayoutParams, so toolbarParams is null there;
+ // the window path needs the original WindowManager.LayoutParams to re-add.
+ val tp = toolbarParams ?: return
+ windowManager.removeView(tv)
+ windowManager.addView(tv, tp)
+ }
}
}
fun removeTranslationOverlays() {
for (view in translationOverlays) {
try {
- windowManager.removeView(view)
+ if (container != null) container.removeView(view) else windowManager.removeView(view)
} catch (_: Exception) {
}
}
@@ -526,18 +638,28 @@ class OverlayUI(
fun showBorderWave() {
if (borderView != null) return
val view = BorderWaveView.create(serviceContext)
- val params =
- WindowManager.LayoutParams(
- WindowManager.LayoutParams.MATCH_PARENT,
- WindowManager.LayoutParams.MATCH_PARENT,
- WindowManager.LayoutParams.TYPE_ACCESSIBILITY_OVERLAY,
- WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or
- WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE or
- WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN,
- PixelFormat.TRANSLUCENT,
+ if (container != null) {
+ container.addView(
+ view,
+ android.widget.FrameLayout.LayoutParams(
+ android.view.ViewGroup.LayoutParams.MATCH_PARENT,
+ android.view.ViewGroup.LayoutParams.MATCH_PARENT,
+ ),
)
- params.spanFullDisplay()
- windowManager.addView(view, params)
+ } else {
+ val params =
+ WindowManager.LayoutParams(
+ WindowManager.LayoutParams.MATCH_PARENT,
+ WindowManager.LayoutParams.MATCH_PARENT,
+ windowType(),
+ WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or
+ WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE or
+ WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN,
+ PixelFormat.TRANSLUCENT,
+ )
+ params.spanFullDisplay()
+ windowManager.addView(view, params)
+ }
borderView = view
view.startAnimation()
}
@@ -546,7 +668,7 @@ class OverlayUI(
borderView?.stopAnimation()
borderView?.let {
try {
- windowManager.removeView(it)
+ if (container != null) container.removeView(it) else windowManager.removeView(it)
} catch (_: Exception) {
}
}
diff --git a/OCR-translation/src/main/java/dev/davidv/translator/assistantOverlay/TranslatorVoiceInteractionSession.kt b/OCR-translation/src/main/java/dev/davidv/translator/assistantOverlay/TranslatorVoiceInteractionSession.kt
index 50449f0..c6dba7d 100644
--- a/OCR-translation/src/main/java/dev/davidv/translator/assistantOverlay/TranslatorVoiceInteractionSession.kt
+++ b/OCR-translation/src/main/java/dev/davidv/translator/assistantOverlay/TranslatorVoiceInteractionSession.kt
@@ -320,6 +320,16 @@ class TranslatorVoiceInteractionSession(
resultHost?.view?.visibility = View.GONE
}
+ /**
+ * Hands the session a screenshot the caller already holds (the in-app path, where
+ * Circle to Search has already captured the screen) instead of the system capture
+ * callback. Reuses the same pending/park/`consumePendingScreenshot` path the system
+ * callback takes, so the resulting overlay behaves identically.
+ */
+ fun setScreenshot(bitmap: Bitmap?) {
+ onHandleScreenshot(bitmap)
+ }
+
override fun onHandleScreenshot(screenshot: Bitmap?) {
super.onHandleScreenshot(screenshot)
// In live mode onShow already handed off to the projection flow; the system
@@ -365,8 +375,18 @@ class TranslatorVoiceInteractionSession(
screenshotView.setImageBitmap(croppedBitmap)
updateBackdrop()
runFullScreenOcr()
+ onScreenshotConsumed?.invoke()
+ onScreenshotConsumed = null
}
+ /**
+ * Invoked once the screenshot passed in via [setScreenshot] has been consumed (cropped and
+ * shown). Used by the app's assistant-only translate hand-off to close the Circle to Search
+ * overlay activity only after this session actually has the frame, so the overlay isn't
+ * dismissed before the capture is taken up. Cleared by [clearCapture] if the show is aborted.
+ */
+ var onScreenshotConsumed: (() -> Unit)? = null
+
private fun runFullScreenOcr() {
val screenshot = screenshotBitmap ?: return
overlayContainer.removeAllViews()
@@ -546,6 +566,7 @@ class TranslatorVoiceInteractionSession(
captureTimeoutJob = null
statusHideJob?.cancel()
statusHideJob = null
+ onScreenshotConsumed = null
pendingScreenshot?.recycle()
pendingScreenshot = null
val ss = screenshotBitmap
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4bbb6b9..8412961 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -68,10 +68,23 @@
android:excludeFromRecents="true"
android:launchMode="singleTask"
android:theme="@style/Theme.CircleToSearch.Transparent">
+ <!-- Assist entry point: lets assist intents (long-press home on builds that
+ route assist through an activity, the ASSIST key, voice-assist
+ entrypoints) resolve to this app directly instead of the system
+ disambiguation dialog. Triggers capture and finishes immediately.
+
+ The ASSIST category on ACTION_ASSIST is what makes the system treat this
+ as *the* assistant entry point: with the assistant role held, assist
+ intents route here directly instead of offering a "complete action using"
+ sheet against other assistants (e.g. Google). -->
<intent-filter>
<action android:name="android.intent.action.ASSIST" />
- <category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.ASSIST" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ <intent-filter>
+ <action android:name="android.intent.action.VOICE_COMMAND" />
+ <category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VOICE_ASSIST" />
diff --git a/app/src/main/java/com/akslabs/circletosearch/AssistEntryActivity.kt b/app/src/main/java/com/akslabs/circletosearch/AssistEntryActivity.kt
index 985c9b4..70a3d90 100644
--- a/app/src/main/java/com/akslabs/circletosearch/AssistEntryActivity.kt
+++ b/app/src/main/java/com/akslabs/circletosearch/AssistEntryActivity.kt
@@ -39,6 +39,17 @@ import com.akslabs.circletosearch.data.BitmapRepository
* a fallback for invocations where no screenshot was delivered.
*/
class AssistEntryActivity : Activity() {
+
+ companion object {
+ /** Cold-start race window: starting this activity may spawn the process before
+ * the system has bound [CircleToSearchVoiceService]; retry briefly for it. */
+ private const val VOICE_SERVICE_RETRY_MS = 100L
+ private const val VOICE_SERVICE_RETRIES = 10
+ }
+
+ private val retryHandler = android.os.Handler(android.os.Looper.getMainLooper())
+ private var screenshot: Bitmap? = null
+
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
@@ -51,19 +62,23 @@ class AssistEntryActivity : Activity() {
}
android.util.Log.d("CircleToSearchAssist", "Assist intent received: ${intent?.action}")
- val screenshot = extractScreenshot(intent)
+ screenshot = extractScreenshot(intent)
+ attemptHandoff(0)
+ }
+ private fun attemptHandoff(attempt: Int) {
+ val shot = screenshot
val voiceService = CircleToSearchVoiceService.instance
if (voiceService != null) {
try {
val args = Bundle()
- if (screenshot != null) {
- args.putParcelable(AssistSessionService.EXTRA_SCREENSHOT_BITMAP, screenshot)
+ if (shot != null) {
+ args.putParcelable(AssistSessionService.EXTRA_SCREENSHOT_BITMAP, shot)
}
// No screenshot attached? Ask the system for one through the
// assistant pipeline instead; the session falls back if it
// never arrives.
- val flags = if (screenshot == null) {
+ val flags = if (shot == null) {
VoiceInteractionSession.SHOW_WITH_SCREENSHOT
} else {
0
@@ -71,7 +86,7 @@ class AssistEntryActivity : Activity() {
voiceService.showSession(args, flags)
android.util.Log.d(
"CircleToSearchAssist",
- "Handed trigger to voice interaction session (screenshot=${screenshot != null})"
+ "Handed trigger to voice interaction session (screenshot=${shot != null}, attempt=$attempt)"
)
finish()
return
@@ -80,10 +95,17 @@ class AssistEntryActivity : Activity() {
}
}
+ // The gesture app may have started this process fresh: the system binds the
+ // voice interaction service slightly later, so retry before giving up.
+ if (attempt < VOICE_SERVICE_RETRIES) {
+ retryHandler.postDelayed({ attemptHandoff(attempt + 1) }, VOICE_SERVICE_RETRY_MS)
+ return
+ }
+
// Assistant session unavailable: still launch without accessibility when
// the system handed us its own screenshot.
- if (screenshot != null) {
- BitmapRepository.setScreenshot(screenshot)
+ if (shot != null) {
+ BitmapRepository.setScreenshot(shot)
try {
startActivity(Intent(this, OverlayActivity::class.java).apply {
addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
@@ -99,6 +121,11 @@ class AssistEntryActivity : Activity() {
finish()
}
+ override fun onDestroy() {
+ retryHandler.removeCallbacksAndMessages(null)
+ super.onDestroy()
+ }
+
private fun extractScreenshot(intent: Intent?): Bitmap? {
val raw = try {
@Suppress("DEPRECATION")
diff --git a/app/src/main/java/com/akslabs/circletosearch/AssistSessionService.kt b/app/src/main/java/com/akslabs/circletosearch/AssistSessionService.kt
index c936599..0dd4818 100644
--- a/app/src/main/java/com/akslabs/circletosearch/AssistSessionService.kt
+++ b/app/src/main/java/com/akslabs/circletosearch/AssistSessionService.kt
@@ -21,6 +21,7 @@ package com.akslabs.circletosearch
import android.content.Context
import android.content.Intent
+import android.graphics.Bitmap
import android.os.Bundle
import android.service.voice.VoiceInteractionSession
import android.service.voice.VoiceInteractionSessionService
@@ -30,21 +31,125 @@ import android.os.VibrationEffect
import android.os.Vibrator
import android.os.Build
import com.akslabs.circletosearch.data.BitmapRepository
+import dev.davidv.translator.TranslatorApplication
class AssistSessionService : VoiceInteractionSessionService() {
companion object {
/** Screenshot handed from AssistEntryActivity (captured by the system's assist pipeline). */
const val EXTRA_SCREENSHOT_BITMAP = "com.akslabs.circletosearch.extra.SCREENSHOT_BITMAP"
+
+ /**
+ * Statically invoked from the in-app translate action (accessibility disabled) to show
+ * the module's assistant translate overlay. This reuses the module's
+ * [TranslatorVoiceInteractionSession] — the exact overlay UI/UX the accessibility path
+ * uses — so the translation screen looks and behaves identically; it is driven by the
+ * assistant permission rather than a separately-built in-app screen.
+ */
+ fun showTranslateOverlay(context: Context, screenshot: Bitmap?) {
+ pendingTranslateScreenshot = screenshot
+ translateMode = true
+ val voiceService = CircleToSearchVoiceService.instance
+ if (voiceService == null) {
+ android.util.Log.e("AssistSessionService", "Voice service not ready; cannot show translate overlay")
+ translateMode = false
+ return
+ }
+ try {
+ // No SHOW_WITH_SCREENSHOT: the screenshot we already hold is handed in via
+ // setScreenshot, so the system doesn't need to capture one itself.
+ voiceService.showSession(Bundle(), 0)
+ // Our overlay activity keeps covering the screen with the frozen capture,
+ // and the module session's window isn't an activity. It is closed once the
+ // session has consumed the frame — see onNewSession / closeOverlayActivity.
+ } catch (e: Exception) {
+ android.util.Log.e("AssistSessionService", "Failed to show translate session", e)
+ translateMode = false
+ }
+ }
+
+ /**
+ * Closes the Circle to Search overlay activity. Called once the module session has
+ * been shown so its window is the one on screen; without this the frozen capture
+ * drawn by the activity covers the session's toolbar/scan UI.
+ */
+ fun closeOverlayActivity(context: Context) {
+ val activity = activityRef ?: return
+ activityRef = null
+ activity.runOnUiThread {
+ android.util.Log.d("AssistSessionService", "Closing overlay activity so module session is visible")
+ activity.finish()
+ }
+ }
+
+ /** [OverlayActivity] registers itself on create so [closeOverlayActivity] can dismiss it. */
+ fun registerOverlayActivity(activity: android.app.Activity) {
+ activityRef = activity
+ }
+
+ private var translateMode = false
+ private var pendingTranslateScreenshot: Bitmap? = null
+ private var activityRef: android.app.Activity? = null
+
+ /** Consumed once by the module session so a later plain assist isn't forced into translate. */
+ internal fun consumeTranslateScreenshot(): Bitmap? =
+ pendingTranslateScreenshot.also { pendingTranslateScreenshot = null }
}
+ private var langStateManager: dev.davidv.translator.LanguageStateManager? = null
+ private var overlayTextTranslationHelper: dev.davidv.translator.OverlayTextTranslationHelper? = null
+
override fun onCreate() {
super.onCreate()
android.util.Log.d("AssistSessionService", "Service onCreate")
+ // Wire the module overlay's dependencies from the shared application singletons.
+ // Mirrors the wiring the module's own TranslatorVoiceInteractionSessionService does,
+ // so the overlay gets the same state as the accessibility path.
+ val app = application as? TranslatorApplication
+ if (app != null) {
+ val lm = dev.davidv.translator.LanguageStateManager(
+ kotlinx.coroutines.CoroutineScope(
+ kotlinx.coroutines.SupervisorJob() + kotlinx.coroutines.Dispatchers.Main
+ ),
+ app.filePathManager,
+ null,
+ )
+ langStateManager = lm
+ overlayTextTranslationHelper =
+ dev.davidv.translator.OverlayTextTranslationHelper(lm, app.languageMetadataManager)
+ }
}
override fun onNewSession(args: Bundle?): VoiceInteractionSession {
android.util.Log.d("AssistSessionService", "onNewSession created")
+ // Translate mode shows the module's assistant overlay — the same UI/UX as the
+ // accessibility path — instead of the search overlay. This is how the translation
+ // screen is reused rather than reimplemented in-app.
+ if (translateMode) {
+ translateMode = false
+ val app = application as? TranslatorApplication
+ val lm = langStateManager
+ val helper = overlayTextTranslationHelper
+ if (app != null && lm != null && helper != null) {
+ android.util.Log.d("AssistSessionService", "Returning module translator session")
+ val session = dev.davidv.translator.assistantOverlay.TranslatorVoiceInteractionSession(
+ this,
+ app.settingsManager,
+ app.translationCoordinator,
+ helper,
+ lm,
+ )
+ // Close our overlay once the session has actually taken up the frame, so
+ // dismissing our activity can't race the hand-off (onShow clears a pending
+ // capture, and the first layout is what triggers consumePendingScreenshot).
+ session.onScreenshotConsumed = { closeOverlayActivity(applicationContext) }
+ // Hand the already-captured screenshot to the session's existing path.
+ val shot = consumeTranslateScreenshot()
+ if (shot != null) session.setScreenshot(shot)
+ return session
+ }
+ android.util.Log.e("AssistSessionService", "Translate deps unavailable; falling back")
+ }
return CircleToSearchSession(this)
}
diff --git a/app/src/main/java/com/akslabs/circletosearch/AssistantTranslateOverlay.kt b/app/src/main/java/com/akslabs/circletosearch/AssistantTranslateOverlay.kt
new file mode 100644
index 0000000..b7f3914
--- /dev/null
+++ b/app/src/main/java/com/akslabs/circletosearch/AssistantTranslateOverlay.kt
@@ -0,0 +1,36 @@
+package com.akslabs.circletosearch
+
+import android.graphics.Bitmap
+
+/**
+ * Activity-scoped holder for the assistant-only translate overlay. Lets
+ * CircleToSearchScreen start translation (no accessibility permission) through the
+ * same OverlayUI chrome the accessibility path uses, hosted in our own activity.
+ */
+object AssistantTranslateOverlay {
+ @Volatile
+ var bridge: AssistantTranslateOverlayBridge? = null
+ private set
+
+ fun attach(b: AssistantTranslateOverlayBridge) {
+ bridge = b
+ }
+
+ fun detach(b: AssistantTranslateOverlayBridge) {
+ if (bridge === b) bridge = null
+ }
+
+ /**
+ * Starts OCR + translation of an already-captured screenshot using the
+ * activity-hosted overlay. Returns false if no bridge is attached.
+ */
+ fun start(screenshot: Bitmap, uiDelayMs: Long = 0L, onClosed: (() -> Unit)? = null): Boolean {
+ val b = bridge ?: return false
+ b.startCapturedTranslation(screenshot, uiDelayMs, onClosed)
+ return true
+ }
+
+ fun close() {
+ bridge?.deactivate()
+ }
+}
diff --git a/app/src/main/java/com/akslabs/circletosearch/AssistantTranslateOverlayBridge.kt b/app/src/main/java/com/akslabs/circletosearch/AssistantTranslateOverlayBridge.kt
new file mode 100644
index 0000000..56609ef
--- /dev/null
+++ b/app/src/main/java/com/akslabs/circletosearch/AssistantTranslateOverlayBridge.kt
@@ -0,0 +1,421 @@
+package com.akslabs.circletosearch
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.Rect
+import android.os.Handler
+import android.os.Looper
+import android.view.View
+import android.view.WindowManager
+import dev.davidv.translator.Language
+import dev.davidv.translator.LanguageMetadataManager
+import dev.davidv.translator.LanguageStateManager
+import dev.davidv.translator.OverlayTextTranslationHelper
+import dev.davidv.translator.ReadingOrder
+import dev.davidv.translator.TranslatorApplication
+import dev.davidv.translator.accessibilityOverlay.OverlayUI
+import dev.davidv.translator.accessibilityOverlay.TranslatorOverlayHost
+import dev.davidv.translator.ui.components.DetectedRegions
+import dev.davidv.translator.ui.components.ImageWordSelection as WordSelection
+import dev.davidv.translator.ui.components.SelectionSurfaceState
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+/**
+ * Activity-hosted translate overlay for the assistant-only path (no accessibility
+ * permission). Reuses the exact same OverlayUI chrome (toolbar, scan, selection surface)
+ * the accessibility path uses, hosted in our own activity's window with a normal
+ * application-overlay window type. The OCR + translation itself is just the
+ * translationCoordinator running on the bitmap — it needs no accessibility permission;
+ * only the TYPE_ACCESSIBILITY_OVERLAY window type did, which is what this replaces.
+ */
+class AssistantTranslateOverlayBridge(
+ private val activity: android.app.Activity,
+) : TranslatorOverlayHost {
+ override val hostContext: Context
+ get() = activity
+
+ private val app = activity.application as TranslatorApplication
+ private val windowManager =
+ activity.getSystemService(Context.WINDOW_SERVICE) as WindowManager
+ private val settingsManager = app.settingsManager
+ private val serviceScope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
+ private val mainHandler = Handler(Looper.getMainLooper())
+ private lateinit var container: android.widget.FrameLayout
+
+ private var active = false
+ private var selectMode = false
+ private var returnToCaller: (() -> Unit)? = null
+ private var providedScreenshot: Bitmap? = null
+ private var forcedSourceLanguage: Language? = null
+ private var forcedTargetLanguage: Language? = null
+ private var isAutoSource: Boolean = true
+ private var capturedChrome: Runnable? = null
+ private var capturedScanning = false
+ private var capturedRegion: Rect? = null
+ private var overlaySession = 0
+
+ private data class TranslatedScreen(
+ val original: Bitmap,
+ val translated: Bitmap,
+ val words: WordSelection,
+ val region: Rect,
+ )
+
+ private var lastResult: TranslatedScreen? = null
+ private val surfaceState = SelectionSurfaceState()
+ private var ocrReadingOrder: ReadingOrder? = null
+
+ private val translationCoordinator
+ get() = runCatching { app.translationCoordinator }.getOrNull()
+
+ override lateinit var langStateManager: LanguageStateManager
+ private set
+ private lateinit var overlayTextTranslationHelper: OverlayTextTranslationHelper
+ private lateinit var ui: OverlayUI
+
+ fun start() {
+ langStateManager = LanguageStateManager(serviceScope, app.filePathManager, null)
+ overlayTextTranslationHelper =
+ OverlayTextTranslationHelper(
+ langStateManager,
+ LanguageMetadataManager(activity, app.languagesFlow),
+ )
+ // The chrome lives in a full-screen FrameLayout inside our overlay activity (already a
+ // window on top of everything), not in separate overlay windows — our activity has no
+ // SYSTEM_ALERT_WINDOW / a11y permission to add TYPE_APPLICATION_OVERLAY windows.
+ container = android.widget.FrameLayout(activity)
+ activity.addContentView(
+ container,
+ android.view.ViewGroup.LayoutParams(
+ android.view.ViewGroup.LayoutParams.MATCH_PARENT,
+ android.view.ViewGroup.LayoutParams.MATCH_PARENT,
+ ),
+ )
+ ui = OverlayUI(this, activity, windowManager, settingsManager, container = container)
+ langStateManager.refreshLanguageAvailability()
+ }
+
+ /**
+ * Starts OCR + translation of the already-captured screenshot immediately. The
+ * chrome (toolbar + scan) draws after [uiDelayMs], once the caller's UI has been
+ * hidden. [onClosed] is invoked when the overlay is dismissed.
+ */
+ fun startCapturedTranslation(
+ screenshot: Bitmap,
+ uiDelayMs: Long = 0L,
+ onClosed: (() -> Unit)? = null,
+ ) {
+ this.returnToCaller = onClosed
+ providedScreenshot = screenshot
+
+ if (active) {
+ if (selectMode) exitSelectMode()
+ beginProvidedTranslation(screenshot)
+ showScanIfScanning()
+ return
+ }
+
+ active = true
+ // The catalog loads asynchronously inside LanguageStateManager.init, and both
+ // OverlayUI.showToolbar and translateRegionBitmap early-return when languageByCode
+ // is still null. Wait for it before starting OCR/translation and showing chrome.
+ serviceScope.launch {
+ langStateManager.catalog.first { it != null }
+ if (!active) return@launch
+ langStateManager.refreshLanguageAvailability()
+ beginProvidedTranslation(screenshot)
+
+ if (uiDelayMs <= 0L) {
+ showCapturedChrome()
+ } else {
+ val show = Runnable {
+ capturedChrome = null
+ if (providedScreenshot != null) showCapturedChrome()
+ }
+ capturedChrome = show
+ mainHandler.postDelayed(show, uiDelayMs)
+ }
+ }
+ }
+
+ private fun showCapturedChrome() {
+ showTranslatorChrome()
+ showScanIfScanning()
+ }
+
+ private fun showScanIfScanning() {
+ if (capturedScanning) capturedRegion?.let { ui.showScanOverlay(surfaceState, it) }
+ }
+
+ private fun cancelCapturedChrome() {
+ capturedChrome?.let { mainHandler.removeCallbacks(it) }
+ capturedChrome = null
+ }
+
+ private fun showTranslatorChrome() {
+ ui.showToolbar(forcedSourceLanguage, forcedTargetLanguage, currentReadingOrderFor(forcedSourceLanguage), isAutoSource)
+ }
+
+ override fun activate() {
+ if (active) return
+ active = true
+ serviceScope.launch {
+ langStateManager.catalog.first { it != null }
+ if (!active) return@launch
+ langStateManager.refreshLanguageAvailability()
+ ui.removeTranslationOverlays()
+ showTranslatorChrome()
+ if (active) handleFullScreenOcr()
+ }
+ }
+
+ override fun deactivate() {
+ cancelCapturedChrome()
+ overlaySession++
+ active = false
+ selectMode = false
+ ui.removeSelectSurface()
+ surfaceState.clear()
+ lastResult = null
+ ui.removeToolbar()
+ ui.removeTranslationOverlays()
+ ui.dismissMenu()
+ providedScreenshot = null
+ returnToCaller?.let { cb ->
+ returnToCaller = null
+ cb()
+ }
+ }
+
+ override fun toggleSelectMode() {
+ if (selectMode) {
+ exitSelectMode()
+ return
+ }
+ selectMode = true
+ ui.setSelectModeUi(true)
+ val res = lastResult
+ if (res != null) {
+ ui.removeTranslationOverlays()
+ surfaceState.showResult(res.translated, res.original, res.words)
+ ui.showSelectSurface(surfaceState, res.region) { onSelectSurfaceDismissed() }
+ } else {
+ handleFullScreenOcr()
+ }
+ }
+
+ private fun exitSelectMode() {
+ selectMode = false
+ lastResult?.let { ui.showBitmapOverlay(it.translated, it.region) }
+ ui.removeSelectSurface()
+ surfaceState.clear()
+ ui.setSelectModeUi(false)
+ }
+
+ private fun onSelectSurfaceDismissed() {
+ if (selectMode) exitSelectMode()
+ }
+
+ override fun toggleFlipOriginal() {
+ if (!selectMode) return
+ ui.setFlipActive(surfaceState.toggleShowOriginal())
+ }
+
+ override fun swapLanguages() {
+ val oldSource = forcedSourceLanguage ?: return
+ val oldTarget = forcedTargetLanguage ?: langStateManager.languageByCode(settingsManager.settings.value.defaultTargetLanguageCode) ?: return
+ if (!langStateManager.canSwapLanguages(oldSource, oldTarget)) return
+ isAutoSource = false
+ forcedSourceLanguage = oldTarget
+ forcedTargetLanguage = oldSource
+ syncReadingOrderForSource()
+ ui.updateToolbarState(forcedSourceLanguage, forcedTargetLanguage, currentReadingOrderFor(forcedSourceLanguage), isAutoSource)
+ if (active) handleFullScreenOcr()
+ }
+
+ override fun showLanguagePicker(isSource: Boolean) {
+ serviceScope.launch {
+ langStateManager.refreshLanguageAvailability()
+ val availableLangs = overlayTextTranslationHelper.awaitAvailableLanguages(isSource)
+ ui.showLanguagePicker(isSource, availableLangs) { lang ->
+ if (isSource) {
+ if (lang == null) {
+ isAutoSource = true
+ } else {
+ isAutoSource = false
+ forcedSourceLanguage = lang
+ }
+ syncReadingOrderForSource()
+ } else {
+ forcedTargetLanguage = lang
+ }
+ ui.updateToolbarState(forcedSourceLanguage, forcedTargetLanguage, currentReadingOrderFor(forcedSourceLanguage), isAutoSource)
+ if (active) handleFullScreenOcr()
+ }
+ }
+ }
+
+ override fun toggleJapaneseOcrMode() {
+ if (forcedSourceLanguage?.code != "ja") return
+ ocrReadingOrder =
+ when (ocrReadingOrder) {
+ null -> ReadingOrder.TOP_TO_BOTTOM_RIGHT_TO_LEFT
+ ReadingOrder.TOP_TO_BOTTOM_RIGHT_TO_LEFT -> ReadingOrder.LEFT_TO_RIGHT
+ ReadingOrder.LEFT_TO_RIGHT -> null
+ }
+ ui.updateToolbarState(forcedSourceLanguage, forcedTargetLanguage, ocrReadingOrder, isAutoSource)
+ if (active) handleFullScreenOcr()
+ }
+
+ override fun showDotsMenu() {
+ ui.showDotsMenu()
+ }
+
+ override fun disableService() {
+ deactivate()
+ }
+
+ override fun handleFullScreenOcr() {
+ val res = lastResult
+ if (selectMode && ui.hasSelectSurface() && res != null) {
+ surfaceState.showProcessing(res.original)
+ serviceScope.launch { translateRegionBitmap(res.original, res.region) }
+ return
+ }
+ ui.removeTranslationOverlays()
+
+ val sourceLang = ocrSourceLanguage()
+ if (!isAutoSource && sourceLang == null) {
+ ui.showOverlayMessage("Set source language first")
+ return
+ }
+
+ val region = fullCaptureRegion()
+ ui.dismissMenu()
+
+ val provided = providedScreenshot
+ if (provided != null) {
+ val cropped = cropToRegion(provided, region) ?: return
+ surfaceState.regions.value = null
+ ui.showScanOverlay(surfaceState, region)
+ serviceScope.launch { translateRegionBitmap(cropped, region) }
+ return
+ }
+ }
+
+ private fun fullCaptureRegion(): Rect =
+ dev.davidv.translator.overlayChrome.OverlayInsets.contentBounds(windowManager)
+
+ private fun beginProvidedTranslation(screenshot: Bitmap) {
+ ui.removeTranslationOverlays()
+
+ val sourceLang = ocrSourceLanguage()
+ if (!isAutoSource && sourceLang == null) {
+ ui.showOverlayMessage("Set source language first")
+ return
+ }
+
+ val region = fullCaptureRegion()
+ ui.dismissMenu()
+
+ val cropped = cropToRegion(screenshot, region) ?: return
+ surfaceState.regions.value = null
+ capturedRegion = region
+ capturedScanning = true
+ serviceScope.launch {
+ try {
+ translateRegionBitmap(cropped, region)
+ } finally {
+ capturedScanning = false
+ }
+ }
+ }
+
+ private fun cropToRegion(full: Bitmap, region: Rect): Bitmap? {
+ val cropLeft = region.left.coerceIn(0, full.width - 1)
+ val cropTop = region.top.coerceIn(0, full.height - 1)
+ val cropWidth = region.width().coerceAtMost(full.width - cropLeft)
+ val cropHeight = region.height().coerceAtMost(full.height - cropTop)
+ if (cropWidth <= 0 || cropHeight <= 0) return null
+ return Bitmap.createBitmap(full, cropLeft, cropTop, cropWidth, cropHeight)
+ }
+
+ private suspend fun translateRegionBitmap(bitmap: Bitmap, region: Rect) {
+ val session = overlaySession
+ val coordinator = translationCoordinator ?: return
+ val sourceLang = ocrSourceLanguage()
+ val targetLang = forcedTargetLanguage ?: langStateManager.languageByCode(settingsManager.settings.value.defaultTargetLanguageCode) ?: return
+ val ocrSourceLang = sourceLang ?: targetLang
+
+ var ocrUnavailable = false
+ val result =
+ withContext(Dispatchers.IO) {
+ coordinator.translateImageWithOverlay(
+ ocrSourceLang,
+ targetLang,
+ bitmap,
+ onMessage = {},
+ readingOrder = currentReadingOrderFor(sourceLang),
+ isAutoSource = isAutoSource,
+ onOcrUnavailable = { ocrUnavailable = true },
+ onDetectedRegions = { boxes, w, h ->
+ surfaceState.regions.value = DetectedRegions(w, h, boxes)
+ },
+ )
+ }
+
+ if (session != overlaySession || !active) return
+
+ ui.removeTranslationOverlays()
+ if (result == null) {
+ if (selectMode) surfaceState.processing.value = false
+ if (ocrUnavailable) {
+ ui.showOverlayMessage(activity.getString(dev.davidv.translator.R.string.ocr_models_missing))
+ }
+ return
+ }
+
+ val words =
+ WordSelection(
+ imageWidth = result.metadata.width.toInt(),
+ imageHeight = result.metadata.height.toInt(),
+ sourceWords = result.metadata.sourceWords,
+ translatedWords = result.translatedWords,
+ )
+ lastResult = TranslatedScreen(original = bitmap, translated = result.correctedBitmap, words = words, region = region)
+ if (selectMode) {
+ surfaceState.showResult(result.correctedBitmap, bitmap, words)
+ if (!ui.hasSelectSurface()) {
+ ui.showSelectSurface(surfaceState, region) { onSelectSurfaceDismissed() }
+ }
+ } else {
+ ui.showBitmapOverlay(result.correctedBitmap, region)
+ }
+ }
+
+ private fun ocrSourceLanguage(): Language? =
+ forcedSourceLanguage ?: settingsManager.settings.value.defaultSourceLanguageCode?.let {
+ langStateManager.languageByCode(it)
+ }
+
+ private fun currentReadingOrderFor(language: Language?): ReadingOrder? =
+ if (language?.code == "ja") ocrReadingOrder else null
+
+ private fun syncReadingOrderForSource() {
+ if (forcedSourceLanguage?.code != "ja") ocrReadingOrder = null
+ }
+
+ fun destroy() {
+ deactivate()
+ ui.dismissMenu()
+ ui.cleanup()
+ serviceScope.cancel()
+ (container.parent as? android.view.ViewGroup)?.removeView(container)
+ }
+}
diff --git a/app/src/main/java/com/akslabs/circletosearch/OverlayActivity.kt b/app/src/main/java/com/akslabs/circletosearch/OverlayActivity.kt
index c3797e8..b9ac50e 100644
--- a/app/src/main/java/com/akslabs/circletosearch/OverlayActivity.kt
+++ b/app/src/main/java/com/akslabs/circletosearch/OverlayActivity.kt
@@ -37,6 +37,7 @@ class OverlayActivity : ComponentActivity() {
private val screenshotBitmap = androidx.compose.runtime.mutableStateOf<android.graphics.Bitmap?>(null)
private val searchModeOverride = androidx.compose.runtime.mutableStateOf<Boolean?>(null)
+ private var translateBridge: AssistantTranslateOverlayBridge? = null
override fun onCreate(savedInstanceState: Bundle?) {
window.setBackgroundDrawable(android.graphics.drawable.ColorDrawable(0))
@@ -66,6 +67,8 @@ class OverlayActivity : ComponentActivity() {
window.addFlags(android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL)
window.addFlags(android.view.WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN)
+ com.akslabs.circletosearch.AssistSessionService.registerOverlayActivity(this)
+
loadScreenshot()
updateOverride(intent)
@@ -87,6 +90,15 @@ class OverlayActivity : ComponentActivity() {
}
}
}
+
+ // Activity-hosted translate overlay: reuses the exact same OverlayUI chrome the
+ // accessibility path uses, hosted in this activity's window (no a11y permission
+ // needed for the OCR/translation — only the window type differed).
+ // NOTE: must be created AFTER setContent — setContent installs the ComposeView
+ // via setContentView, which removes any previously added content views (including
+ // the bridge's container), detaching the translate chrome from the window.
+ translateBridge = AssistantTranslateOverlayBridge(this).also { it.start() }
+ AssistantTranslateOverlay.attach(translateBridge!!)
}
@@ -123,6 +135,11 @@ class OverlayActivity : ComponentActivity() {
override fun onDestroy() {
super.onDestroy()
+ translateBridge?.let {
+ AssistantTranslateOverlay.detach(it)
+ it.destroy()
+ }
+ translateBridge = null
if (isFinishing) {
com.akslabs.circletosearch.data.BitmapRepository.clear()
com.akslabs.circletosearch.utils.StorageUtils.clearAppCache(this)
diff --git a/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.kt b/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.kt
index 9114fac..a22e796 100644
--- a/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.kt
+++ b/app/src/main/java/com/akslabs/circletosearch/ui/CircleToSearchScreen.kt
@@ -21,6 +21,7 @@ package com.akslabs.circletosearch.ui
import android.graphics.Bitmap
import android.graphics.Rect
+import com.akslabs.circletosearch.AssistSessionService
import com.akslabs.circletosearch.CircleToSearchAccessibilityService
import android.util.Base64
import android.view.Display
@@ -67,6 +68,7 @@ import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.offset
import androidx.compose.foundation.layout.padding
@@ -74,15 +76,20 @@ import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.statusBarsPadding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.wrapContentSize
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.BorderOuter
import androidx.compose.material.icons.filled.Close
import androidx.compose.material.icons.filled.Code
+import androidx.compose.material.icons.automirrored.filled.FormatTextdirectionRToL
import androidx.compose.material.icons.filled.ContentCopy
+import androidx.compose.material.icons.filled.SwapVert
import androidx.compose.material.icons.filled.DarkMode
import androidx.compose.material.icons.filled.DesktopWindows
import androidx.compose.material.icons.filled.Favorite
@@ -108,6 +115,7 @@ import androidx.compose.material.icons.filled.Email
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
import androidx.compose.material3.FilledTonalIconButton
+import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.IconButtonDefaults
@@ -116,8 +124,10 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.ModalBottomSheet
import androidx.compose.material3.ScrollableTabRow
import androidx.compose.material3.SheetValue
+import androidx.compose.material3.Surface
import androidx.compose.material3.Tab
import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
import androidx.compose.material3.VerticalDivider
import androidx.compose.material3.rememberModalBottomSheetState
import androidx.compose.runtime.Composable
@@ -156,6 +166,7 @@ import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.window.Dialog
import com.akslabs.circletosearch.R
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextOverflow
@@ -173,6 +184,7 @@ import com.akslabs.circletosearch.utils.ImageSearchUploader
import com.akslabs.circletosearch.utils.ImageUtils
import com.akslabs.circletosearch.utils.QrResult
import com.akslabs.circletosearch.utils.QrResultWithBounds
+import dev.davidv.translator.localizedName
import com.akslabs.circletosearch.utils.QrScanner
import com.akslabs.circletosearch.ui.qrResultShortLabel
import com.akslabs.circletosearch.utils.UIPreferences
@@ -775,7 +787,9 @@ fun CircleToSearchScreen(
isExtractingEntities = false
entityScanGeneration = entityScanGeneration + 1
if (isTranslatorMode) {
- CircleToSearchAccessibilityService.instance?.closeTranslateOverlay()
+ val a11y = CircleToSearchAccessibilityService.instance
+ if (a11y != null) a11y.closeTranslateOverlay()
+ else com.akslabs.circletosearch.AssistantTranslateOverlay.close()
}
}
}
@@ -1083,7 +1097,12 @@ fun CircleToSearchScreen(
// Back Handler Logic
BackHandler(enabled = true) {
if (isTranslatorMode) {
- CircleToSearchAccessibilityService.instance?.closeTranslateOverlay()
+ val service = CircleToSearchAccessibilityService.instance
+ if (service != null) {
+ service.closeTranslateOverlay()
+ } else {
+ com.akslabs.circletosearch.AssistantTranslateOverlay.close()
+ }
return@BackHandler
}
val currentWebView = webViews[selectedEngine]
@@ -1102,7 +1121,9 @@ fun CircleToSearchScreen(
// only when a prioritized callback receives it. In translator mode back is consumed
// with no window transition, so a predictive handler keeps the arrow visible — and
// the overlay windows (drawn above the arrow) fade out while the gesture runs.
- PredictiveBackHandler(enabled = isTranslatorMode) { progress ->
+ // Only the accessibility path draws its chrome in separate windows it can fade, so
+ // assistant mode (activity-hosted chrome) falls back to the plain BackHandler above.
+ PredictiveBackHandler(enabled = isTranslatorMode && CircleToSearchAccessibilityService.instance != null) { progress ->
val service = CircleToSearchAccessibilityService.instance
try {
progress.collect { event ->
@@ -1977,35 +1998,67 @@ fun CircleToSearchScreen(
onClick = {
haptic.performHapticFeedback(androidx.compose.ui.hapticfeedback.HapticFeedbackType.LongPress)
val bmp = screenshot
- val translatorService = CircleToSearchAccessibilityService.instance
- if (bmp == null || translatorService == null) {
+ if (bmp == null) {
android.widget.Toast.makeText(context, context.getString(R.string.toast_translate_unavailable), android.widget.Toast.LENGTH_SHORT).show()
- } else {
- selectionRect = null
- selectedBitmap = null
- isSearching = false
- currentPathPoints.clear()
- scope.launch { selectionAnim.snapTo(0f) }
+ return@combinedClickable
+ }
+ selectionRect = null
+ selectedBitmap = null
+ isSearching = false
+ currentPathPoints.clear()
+ scope.launch { selectionAnim.snapTo(0f) }
+
+ val translatorService = CircleToSearchAccessibilityService.instance
+ if (translatorService != null) {
isTranslatorMode = true
// OCR starts now; only the overlay chrome waits for the hide delay.
val started = translatorService.translateCapturedScreen(bmp, TRANSLATE_HIDE_DELAY_MS) {
isTranslatorMode = false
}
- if (!started) {
- isTranslatorMode = false
- android.widget.Toast.makeText(context, context.getString(R.string.toast_translate_unavailable), android.widget.Toast.LENGTH_SHORT).show()
- }
+ if (started) return@combinedClickable
+ isTranslatorMode = false
+ }
+ // No accessibility service (or its bridge failed):
+ // show the module's translate overlay hosted in our
+ // own activity — same OverlayUI chrome as the a11y path.
+ isTranslatorMode = true
+ val startedTranslate = com.akslabs.circletosearch.AssistantTranslateOverlay.start(bmp, TRANSLATE_HIDE_DELAY_MS) {
+ isTranslatorMode = false
+ }
+ if (!startedTranslate) {
+ isTranslatorMode = false
+ android.widget.Toast.makeText(context, context.getString(R.string.toast_translate_unavailable), android.widget.Toast.LENGTH_SHORT).show()
}
},
onLongClick = {
haptic.performHapticFeedback(androidx.compose.ui.hapticfeedback.HapticFeedbackType.LongPress)
val bmp = screenshot
- val translatorService = CircleToSearchAccessibilityService.instance
- if (bmp == null || translatorService == null) {
+ if (bmp == null) {
android.widget.Toast.makeText(context, context.getString(R.string.toast_translate_unavailable), android.widget.Toast.LENGTH_SHORT).show()
- } else {
+ return@combinedClickable
+ }
+ selectionRect = null
+ selectedBitmap = null
+ isSearching = false
+ currentPathPoints.clear()
+ scope.launch { selectionAnim.snapTo(0f) }
+
+ val translatorService = CircleToSearchAccessibilityService.instance
+ if (translatorService != null) {
translatorService.translateCapturedScreen(bmp, TRANSLATE_TRIGGER_DELAY_MS)
onClose()
+ } else {
+ // No accessibility service: long-press behaves like a
+ // short press — show the module's translate overlay
+ // hosted in our own activity.
+ isTranslatorMode = true
+ val startedTranslate = com.akslabs.circletosearch.AssistantTranslateOverlay.start(bmp, TRANSLATE_TRIGGER_DELAY_MS) {
+ isTranslatorMode = false
+ }
+ if (!startedTranslate) {
+ isTranslatorMode = false
+ android.widget.Toast.makeText(context, context.getString(R.string.toast_translate_unavailable), android.widget.Toast.LENGTH_SHORT).show()
+ }
}
}
),
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d8838b5..3b57dbe 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -121,6 +121,7 @@
<!-- Toast Messages -->
<string name="toast_translate_unavailable">Translation unavailable. Check accessibility service.</string>
+ <string name="label_translating">Translating…</string>
<string name="toast_saved_to_gallery">Saved to Gallery</string>
<string name="toast_failed_to_save">Failed to save</string>
<string name="toast_accessibility_permission_needed">Allow accessibility permission to use this feature</string>
diff --git a/logs.md b/logs.md
index 0dfec3b..e69de29 100644
--- a/logs.md
+++ b/logs.md
@@ -1,25 +0,0 @@
-time: 1789069896381
-device fp:realme/RMX1851/RMX1851:11/RKQ1.201217.002/1623376276806:user/release-keys
-product board:sdm710
-everest vers:
-msg: android.view.WindowManager$BadTokenException: Unable to add window -- token null is not valid; is your activity running?
-stacktrace: java.lang.RuntimeException: Unable to start service dev.davidv.translator.screenTranslate.ScreenTranslateService@50bed5e with Intent { xflg=0x4 cmp=com.akslabs.circletosearch/dev.davidv.translator.screenTranslate.ScreenTranslateService (has extras) }
-at android.app.ActivityThread.handleServiceArgs(ActivityThread.java:5740)
-at android.app.ActivityThread.-$$Nest$mhandleServiceArgs(Unknown Source:0)
-at android.app.ActivityThread$H.handleMessage(ActivityThread.java:2788)
-at android.os.Handler.dispatchMessage(Handler.java:132)
-at android.os.Looper.dispatchMessage(Looper.java:333)
-at android.os.Looper.loopOnce(Looper.java:263)
-at android.os.Looper.loop(Looper.java:367)
-at android.app.ActivityThread.main(ActivityThread.java:9317)
-at java.lang.reflect.Method.invoke(Native Method)
-at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:569)
-at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:966)
-Caused by: android.view.WindowManager$BadTokenException: Unable to add window -- token null is not valid; is your activity running?
-at android.view.ViewRootImpl.setView(ViewRootImpl.java:1695)
-at android.view.WindowManagerGlobal.addView(WindowManagerGlobal.java:500)
-at android.view.WindowManagerImpl.addView(WindowManagerImpl.java:167)
-at dev.davidv.translator.screenTranslate.ScreenTranslateService.setupOverlayAndCapture(ScreenTranslateService.kt:298)
-at dev.davidv.translator.screenTranslate.ScreenTranslateService.onStartCommand(ScreenTranslateService.kt:204)
-at android.app.ActivityThread.handleServiceArgs(ActivityThread.java:5724)
-... 10 more
\ No newline at end of file