1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: remove uneccessary calls to QtNative from QtActivity

Browse Source 
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>
This commit is contained in:
Assam Boudjelthia 2022-09-30 16:36:15 +03:00
parent d1760bc810
commit 90b3b17545
2 changed files with 0 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

158
src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java
View File

@ -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);
}
}

11
src/android/java/src/org/qtproject/qt/android/bindings/QtService.java
View File

@ -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();
}
}