From 01b6e8180b25dbb4caf16cea0863f96ed86f76be Mon Sep 17 00:00:00 2001 From: Petri Virkkunen Date: Sun, 31 Mar 2024 15:46:50 +0300 Subject: [PATCH] Android: Remove unused context menu functions from QtActivityDelegateBase These are unused functions. They're only called through JNI and those calls are now through the interface system, so through the interface, which is the QtActivityDelegate object. These functions are also already overridden and, in the case of openContextMenu, only implemented by QtActivityDelegate anyways. Task-number: QTBUG-118874 Change-Id: I69f41752626ac9892ecef8e40187dfe4663ab08a Reviewed-by: Assam Boudjelthia --- .../qt/android/QtActivityDelegateBase.java | 25 ------------------- 1 file changed, 25 deletions(-) diff --git a/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegateBase.java b/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegateBase.java index 9127bc8e4b9..4980a47d08d 100644 --- a/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegateBase.java +++ b/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegateBase.java @@ -50,7 +50,6 @@ abstract class QtActivityDelegateBase void setUpLayout() {} void setUpSplashScreen(int orientation) {} void hideSplashScreen(final int duration) {} - void openContextMenu(final int x, final int y, final int w, final int h) {} void setActionBarVisibility(boolean visible) {} QtActivityDelegateBase(Activity activity) @@ -175,28 +174,4 @@ abstract class QtActivityDelegateBase break; } } - - @UsedFromNativeCode - public void resetOptionsMenu() - { - QtNative.runAction(() -> m_activity.invalidateOptionsMenu()); - } - - @UsedFromNativeCode - public void openOptionsMenu() - { - QtNative.runAction(() -> m_activity.openOptionsMenu()); - } - - public void onCreatePopupMenu(Menu menu) - { - QtNative.fillContextMenu(menu); - m_contextMenuVisible = true; - } - - @UsedFromNativeCode - public void closeContextMenu() - { - QtNative.runAction(() -> m_activity.closeContextMenu()); - } }