add AndroidWindowContext with window pointer

driver/native.go

@@ -11,13 +11,23 @@ type NativeWindow interface {
 }
 
 // AndroidContext is passed to the RunNative callback when it is executed on an Android device.
-// The VM, Env and Ctx pointers are reqiured to make various calls into JVM methods.
+// The VM, Env and Ctx pointers are required to make various calls into JVM methods.
 //
 // Since: 2.3
 type AndroidContext struct {
 	VM, Env, Ctx uintptr
 }
 
+// AndroidWindowContext is passed to the NativeWindow.RunNative callback when it is executed
+// on an Android device. The NativeWindow field is of type `*C.ANativeWindow`.
+// The VM, Env and Ctx pointers are required to make various calls into JVM methods.
+//
+// Since: 2.5
+type AndroidWindowContext struct {
+	AndroidContext
+	NativeWindow uintptr
+}
+
 // UnknownContext is passed to the RunNative callback when it is executed
 // on devices or windows without special native context.
 //
@@ -34,7 +44,7 @@ type WindowsWindowContext struct {
 }
 
 // MacWindowContext is passed to the NativeWindow.RunNative callback
-// when it is executed on a Mac OS device.
+// when it is executed on a macOS device.
 //
 // Since: 2.5
 type MacWindowContext struct {

internal/driver/mobile/app/android.go

@@ -476,7 +476,7 @@ func mainUI(vm, jniEnv, ctx uintptr) error {
 				DarkMode:      darkMode,
 			}
 			theApp.events.In() <- currentSize
-			theApp.events.In() <- paint.Event{External: true}
+			theApp.events.In() <- paint.Event{External: true, Window: uintptr(unsafe.Pointer(w))}
 		case <-windowDestroyed:
 			if C.surface != nil {
 				if errStr := C.destroyEGLSurface(); errStr != nil {

internal/driver/mobile/driver.go

@@ -258,8 +258,11 @@ func (d *driver) handleLifecycle(e lifecycle.Event, w *window) {
 	}
 }
 
-func (d *driver) handlePaint(e paint.Event, w fyne.Window) {
+func (d *driver) handlePaint(e paint.Event, w *window) {
 	c := w.Canvas().(*canvas)
+	if e.Window != 0 { // not all paint events come from hardware
+		w.handle = e.Window
+	}
 	d.painting = false
 	if d.glctx == nil || e.External {
 		return

internal/driver/mobile/event/paint/paint.go

@@ -21,4 +21,7 @@ type Event struct {
 	// should ignore external paint events to avoid a backlog of paint
 	// events building up.
 	External bool
+
+	// Window specifies a native handle for the window being painted into.
+	Window uintptr
 }

internal/driver/mobile/window.go

@@ -23,6 +23,7 @@ type window struct {
 	canvas    *canvas
 	icon      fyne.Resource
 	menu      *fyne.MainMenu
+	handle    uintptr // the window handle - currently just Android
 }
 
 func (w *window) Title() string {

internal/driver/mobile/window_android.go

@@ -12,8 +12,14 @@ var _ driver.NativeWindow = (*window)(nil)
 
 func (w *window) RunNative(f func(context any) error) error {
 	return app.RunOnJVM(func(vm, env, ctx uintptr) error {
-		// TODO: define driver.AndroidWindowContext that also includes the View
-		data := &driver.AndroidContext{VM: vm, Env: env, Ctx: ctx}
+		data := &driver.AndroidWindowContext{
+			NativeWindow: w.handle,
+			AndroidContext: driver.AndroidContext{
+				VM:  vm,
+				Env: env,
+				Ctx: ctx,
+			},
+		}
 		return f(data)
 	})
 }