summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAssam Boudjelthia <assam.boudjelthia@qt.io>2022-09-30 16:36:15 +0300
committerAssam Boudjelthia <assam.boudjelthia@qt.io>2023-10-12 11:59:38 +0300
commit90b3b17545e9b2102a0b5580fa1436b0a8b47a7e (patch)
tree30227e1d630522d8e416e93cffb9cba956ab6a9d
parentd1760bc8100c94a831f80080a5433a360266c5e2 (diff)
Android: remove uneccessary calls to QtNative from QtActivity
These forward calls to QtNative don't need to be present inside the QtActivity implementation, all those calls are invoked by the Delegate classes. Task-number: QTBUG-115014 Task-number: QTBUG-114593 Change-Id: Id1bfa694687af3edc4e9b82b09cf13e1f8eba1de Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io> Reviewed-by: Tinja Paavoseppä <tinja.paavoseppa@qt.io>
-rw-r--r--src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java158
-rw-r--r--src/android/java/src/org/qtproject/qt/android/bindings/QtService.java11
2 files changed, 0 insertions, 169 deletions
diff --git a/src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java b/src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java
index 28f3808433..63884dc674 100644
--- a/src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java
+++ b/src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java
@@ -992,162 +992,4 @@ public class QtActivity extends Activity
return;
}
}
-
- public void bringChildToBack(int id)
- {
- QtNative.activityDelegate().bringChildToBack(id);
- }
-
- public void bringChildToFront(int id)
- {
- QtNative.activityDelegate().bringChildToFront(id);
- }
-
- public void closeContextMenu()
- {
- QtNative.activityDelegate().closeContextMenu();
- }
-
- public void createSurface(int id, boolean onTop, int x, int y, int w, int h, int imageDepth)
- {
- QtNative.activityDelegate().createSurface(id, onTop, x, y, w, h, imageDepth);
- }
-
- public void destroySurface(int id)
- {
- QtNative.activityDelegate().destroySurface(id);
- }
-
- public int getSurfaceCount()
- {
- return QtNative.activityDelegate().getSurfaceCount();
- }
-
- public void hideSoftwareKeyboard()
- {
- QtNative.activityDelegate().hideSoftwareKeyboard();
- }
-
- public void hideSplashScreen()
- {
- QtNative.activityDelegate().hideSplashScreen();
- }
-
- public void hideSplashScreen(final int duration)
- {
- QtNative.activityDelegate().hideSplashScreen(duration);
- }
-
- public void initializeAccessibility()
- {
- QtNative.activityDelegate().initializeAccessibility();
- }
-
- public void insertNativeView(int id, View view, int x, int y, int w, int h)
- {
- QtNative.activityDelegate().insertNativeView(id, view, x, y, w, h);
- }
-
- public boolean loadApplication(Activity activity, ClassLoader classLoader, Bundle loaderParams)
- {
- return QtNative.activityDelegate().loadApplication(activity, classLoader, loaderParams);
- }
-
- public void onCreatePopupMenu(Menu menu)
- {
- QtNative.activityDelegate().onCreatePopupMenu(menu);
- }
-
- public void onTerminate()
- {
- QtNative.activityDelegate().onTerminate();
- }
-
- public void openContextMenu(final int x, final int y, final int w, final int h)
- {
- QtNative.activityDelegate().openContextMenu(x, y, w, h);
- }
-
- public void resetOptionsMenu()
- {
- QtNative.activityDelegate().resetOptionsMenu();
- }
-
- public void resetSoftwareKeyboard()
- {
- QtNative.activityDelegate().resetSoftwareKeyboard();
- }
-
- public boolean setKeyboardVisibility(boolean visibility, long timeStamp)
- {
- return QtNative.activityDelegate().setKeyboardVisibility(visibility, timeStamp);
- }
-
- public void setSurfaceGeometry(int id, int x, int y, int w, int h)
- {
- QtNative.activityDelegate().setSurfaceGeometry(id, x, y, w, h);
- }
-
- public void setSystemUiVisibility(int systemUiVisibility)
- {
- QtNative.activityDelegate().setSystemUiVisibility(systemUiVisibility);
- }
-
- public void showSoftwareKeyboard(final int x, final int y, final int width,
- final int height, final int inputHints,
- final int enterKeyType)
- {
- QtNative.activityDelegate().showSoftwareKeyboard(x, y, width, height, inputHints, enterKeyType);
- }
-
- public boolean startApplication()
- {
- return QtNative.activityDelegate().startApplication();
- }
-
- public void updateFullScreen()
- {
- QtNative.activityDelegate().updateFullScreen();
- }
-
- public void updateHandles(int mode, int editX, int editY, int editButtons,
- int x1, int y1, int x2, int y2, boolean rtl)
- {
- QtNative.activityDelegate().updateHandles(mode, editX, editY, editButtons, x1, y1, x2, y2, rtl);
- }
-
- public void updateSelection(int selStart, int selEnd, int candidatesStart, int candidatesEnd)
- {
- QtNative.activityDelegate().updateSelection(selStart, selEnd, candidatesStart, candidatesEnd);
- }
-
- public void notifyAccessibilityLocationChange(int viewId)
- {
- QtNative.activityDelegate().notifyAccessibilityLocationChange(viewId);
- }
-
- public void notifyObjectHide(int viewId, int parentId)
- {
- QtNative.activityDelegate().notifyObjectHide(viewId, parentId);
- }
-
- public void notifyObjectFocus(int viewId)
- {
- QtNative.activityDelegate().notifyObjectFocus(viewId);
- }
-
- public void notifyValueChanged(int viewId, String value)
- {
- QtNative.activityDelegate().notifyValueChanged(viewId, value);
- }
-
- public boolean isKeyboardVisible()
- {
- return QtNative.activityDelegate().isKeyboardVisible();
- }
-
- public void notifyQtAndroidPluginRunning(boolean running)
- {
- QtNative.activityDelegate().notifyQtAndroidPluginRunning(running);
- }
}
diff --git a/src/android/java/src/org/qtproject/qt/android/bindings/QtService.java b/src/android/java/src/org/qtproject/qt/android/bindings/QtService.java
index 9ec9dbb4a0..d900c33f0a 100644
--- a/src/android/java/src/org/qtproject/qt/android/bindings/QtService.java
+++ b/src/android/java/src/org/qtproject/qt/android/bindings/QtService.java
@@ -136,15 +136,4 @@ public class QtService extends Service
{
return super.onUnbind(intent);
}
- //---------------------------------------------------------------------------
-
- public boolean loadApplication(Service service, ClassLoader classLoader, Bundle loaderParams)
- {
- return QtNative.serviceDelegate().loadApplication(service, classLoader, loaderParams);
- }
-
- public boolean startApplication()
- {
- return QtNative.serviceDelegate().startApplication();
- }
}