Skip to content

Commit d996a68

Browse files
authored
Add overridden method for default (#1464)
1 parent cdb14f2 commit d996a68

File tree

3 files changed

+34
-0
lines changed

3 files changed

+34
-0
lines changed

instrumentation/compose/click/src/main/kotlin/io/opentelemetry/instrumentation/compose/click/WindowCallbackWrapper.kt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ package io.opentelemetry.instrumentation.compose.click
77

88
import android.os.Build.VERSION_CODES
99
import android.view.ActionMode
10+
import android.view.KeyboardShortcutGroup
11+
import android.view.Menu
1012
import android.view.MotionEvent
1113
import android.view.SearchEvent
1214
import android.view.Window.Callback
@@ -21,6 +23,20 @@ internal class WindowCallbackWrapper(
2123
return callback.dispatchTouchEvent(event)
2224
}
2325

26+
@RequiresApi(api = VERSION_CODES.O)
27+
override fun onPointerCaptureChanged(hasCapture: Boolean) {
28+
callback.onPointerCaptureChanged(hasCapture)
29+
}
30+
31+
@RequiresApi(api = VERSION_CODES.N)
32+
override fun onProvideKeyboardShortcuts(
33+
data: List<KeyboardShortcutGroup?>?,
34+
menu: Menu?,
35+
deviceId: Int,
36+
) {
37+
callback.onProvideKeyboardShortcuts(data, menu, deviceId)
38+
}
39+
2440
@RequiresApi(api = VERSION_CODES.M)
2541
override fun onSearchRequested(searchEvent: SearchEvent?): Boolean = callback.onSearchRequested(searchEvent)
2642

instrumentation/view-click/api/view-click.api

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ public final class io/opentelemetry/android/instrumentation/view/click/WindowCal
3535
public fun onMenuItemSelected (ILandroid/view/MenuItem;)Z
3636
public fun onMenuOpened (ILandroid/view/Menu;)Z
3737
public fun onPanelClosed (ILandroid/view/Menu;)V
38+
public fun onPointerCaptureChanged (Z)V
3839
public fun onPreparePanel (ILandroid/view/View;Landroid/view/Menu;)Z
40+
public fun onProvideKeyboardShortcuts (Ljava/util/List;Landroid/view/Menu;I)V
3941
public fun onSearchRequested ()Z
4042
public fun onSearchRequested (Landroid/view/SearchEvent;)Z
4143
public fun onWindowAttributesChanged (Landroid/view/WindowManager$LayoutParams;)V

instrumentation/view-click/src/main/kotlin/io/opentelemetry/android/instrumentation/view/click/WindowCallbackWrapper.kt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ package io.opentelemetry.android.instrumentation.view.click
77

88
import android.os.Build.VERSION_CODES
99
import android.view.ActionMode
10+
import android.view.KeyboardShortcutGroup
11+
import android.view.Menu
1012
import android.view.MotionEvent
1113
import android.view.SearchEvent
1214
import android.view.Window.Callback
@@ -21,6 +23,20 @@ class WindowCallbackWrapper(
2123
return callback.dispatchTouchEvent(event)
2224
}
2325

26+
@RequiresApi(api = VERSION_CODES.O)
27+
override fun onPointerCaptureChanged(hasCapture: Boolean) {
28+
callback.onPointerCaptureChanged(hasCapture)
29+
}
30+
31+
@RequiresApi(api = VERSION_CODES.N)
32+
override fun onProvideKeyboardShortcuts(
33+
data: List<KeyboardShortcutGroup?>?,
34+
menu: Menu?,
35+
deviceId: Int,
36+
) {
37+
callback.onProvideKeyboardShortcuts(data, menu, deviceId)
38+
}
39+
2440
@RequiresApi(api = VERSION_CODES.M)
2541
override fun onSearchRequested(searchEvent: SearchEvent?): Boolean = callback.onSearchRequested(searchEvent)
2642

0 commit comments

Comments
 (0)