summaryrefslogtreecommitdiffstats
path: root/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-12-181-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/painting.pri src/plugins/platforms/xcb/qxcbconnection.cpp tests/auto/corelib/thread/qthreadstorage/qthreadstorage.pro tests/auto/corelib/tools/qlocale/test/test.pro tests/auto/gui/kernel/qwindow/tst_qwindow.cpp tools/configure/environment.cpp Change-Id: I9c40f458b89b2c206de2d2c24e90b5f679c93495
| * Android: Fix crash at exitBogDan Vatra2015-12-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Delay the exit call until Java part finishes the execution. We must be sure all the threads are stopped (hanged), when we call exit, otherwise java thread will try to use static vars that are freed by the qt thread. We also need to call exit from Qt thread, otherwise Qt will complain about it. Change-Id: Ia1e7a4d7d56c39d38313f040aab618ec5a68dfb6 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | Android: Remove support for API < 16BogDan Vatra2015-12-101-109/+42
| | | | | | | | | | | | | | | | | | Starting with Qt 5.7 we removed support for API < 16 (Android v4.1) [ChangeLog][Android] Support for Android API < 16 was removed. Change-Id: I8bf396a9d70ab0996965e0c9f629800aa1fa6a45 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devSimon Hausmann2015-12-081-0/+21
|\| | | | | | | Change-Id: I2532c7f7db5e6cc3ef09753d886279816dd662b2
| * Android: Implement QInputMethod::keyboardRectangleOlivier Goffart2015-12-071-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can use getWindowVisibleDisplayFrame to know the height on the keyboard, and we can use getLocationOnScreen to find out how much the view is scrolled. Since onPreDraw is always called when the view is scrolled or when the keyboard appears or disapear, we can call the native functions from there. This is not working for floating keyboards. [ChangeLog][Android] Implemented QInputMethod::keyboardRectangle Task-number: QTBUG-40731 Change-Id: I7848eb34fece410b29a06bf0bbb2313112fffa68 Reviewed-by: Samuel Nevala <samuel.nevala@intopalo.com> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-11-041-11/+14
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/unix/ptrsize.test configure src/corelib/global/qnamespace.h src/network/socket/qabstractsocket.cpp tests/auto/other/networkselftest/networkselftest.pro Change-Id: Ic78abb4a34f9068567cea876861d4220f5a07672
| * Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-231-11/+14
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qcfsocketnotifier.cpp src/tools/qdoc/qdocindexfiles.cpp Change-Id: Iae365b23afc611de8794f22cceae8b210d25aa8a
| | * Android: Don't show the VK when the state is set to HIDDEN by the user.Christian Strømme2015-10-191-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | Don't call showSoftInput() if the state is set to _HIDDEN or _ALWAYS_HIDDEN by the user. Task-number: QTBUG-46528 Change-Id: I5dbaf612cf4f339c5288d6d3292c27cc6217f3af Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| | * Android: Improve the way we update layout params for native views.Christian Strømme2015-10-191-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing and adding a view each time the layout parameters changes is triggering unnecessary layout updates. The affect of this is not very visible since there are few views in the layout, but the procedure is never the less wasteful. Change-Id: I2540ab519b12c6d3e10457e2e518b439118b966d Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-10-231-42/+52
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf configure src/corelib/global/qglobal.h src/tools/qdoc/node.cpp src/tools/qdoc/qdocdatabase.cpp tests/auto/corelib/io/qsettings/tst_qsettings.cpp tools/configure/configureapp.cpp Change-Id: I66028ae5e441a06b73ee85ba72a03a3af3e8593f
| * | Android: Make sure we deliver all queued actions when we resume.BogDan Vatra2015-10-201-20/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | When the activity is paused, all runOnUi actions are dropped :(, this patch ensures that no action is lost no matter what. Task-number: QTBUG-45526 Change-Id: I61db4f73b0d2da47bf71a1324dc40b90dab01e81 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| * | Android: Set "immersive" mode on earlier android versions.BogDan Vatra2015-10-161-22/+17
| | | | | | | | | | | | | | | | | | | | | Most of "immersive" flags are available on earlier Android versions. Change-Id: Ic4f03a3c9491570bc5f8c5afbb61669644b20d8e Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
| * | Dispatch all key and all generic motion events java objects to QtCoreBogDan Vatra2015-10-151-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These events are needed to enable the usage of all input methods available on Android e.g. gamepads, stylus, etc. In orer to get GenericMotionEvents your application min API version must be at least 12, otherwise the application will receive only key events. Change-Id: I7564fccaf5423aa318ba4f62317eaf101ba6e97e Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* | | Android: Update splash screen in onConfigurationChangedDaiwei Li2015-10-161-0/+17
|/ / | | | | | | | | | | | | | | | | When the device orientation changes, we should set the background to a drawable appropriate for that orientation. Task-number: QTBUG-44238 Change-Id: I4ea50aedc704060c0b35c2d35b75cbaed3b4979a Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* / Android: Add support for EnterKeyKai Uwe Broulik2015-08-111-3/+39
|/ | | | | | | | | QAndroidInputContext now sends along the EnterKey type provided by the EnterKey input method query enabling the QtActivityDelegate to set the imeOptions for the TextView accordingly. Change-Id: Ic96077ab4b11cf6dec52283ecf66b2cabe7af665 Reviewed-by: BogDan Vatra <bogdan@kde.org>
* Android: Start the application when we know the screen geometry.BogDan Vatra2015-07-301-12/+18
| | | | | | | | | Until now we'se set the screenGemetry to 0,0 until the layout is created, but some controls needs it before that. Task-number: QTBUG-44271 Change-Id: I7d00e2a142572e27fc77e46566bb2cdb37f58035 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Android: Delay initialization of Accessibility.Christian Strømme2015-06-091-16/+18
| | | | | | | | | | | | | The accessibility class was created and activated in onCreate(), which meant we where trying to activate accessibility before the platform plugin was properly initialized. With this change we will also activate, or deactivate, accessibility in Qt whenever the state is changed by Android, compared to doing it at start-up only. Task-number: QTBUG-46355 Change-Id: I5cbae125df43f7694d4464d5054e6cfec4626e26 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Revert "Android: Don't show translucent system UI on top of Qt"Eskil Abrahamsen Blomfeldt2015-05-301-24/+1
| | | | | | | | | | | | | This reverts commit c9aaa3e2cde5ffe5edaa4f17f84020d82609b7e9. This fix broke fullscreen mode on Android. A better solution is in the works, but we'll probably push that to Qt 5.5.1 instead since it comes with a risk and we don't want to delay the release any further. Change-Id: I3aae6d52ebb8425089cdb6f7fc4c8ce9ad4911df Task-number: QTBUG-38700 Task-number: QTBUG-46234 Reviewed-by: BogDan Vatra <bogdan@kde.org>
* Pass on the auto repeat information for key eventsAndy Shaw2015-04-151-5/+4
| | | | | | Task-number: QTBUG-45340 Change-Id: Iecc55987fa784e4bf14317d9d4a085a8f0b58451 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* Android: Don't show translucent system UI on top of QtEskil Abrahamsen Blomfeldt2015-03-121-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | On devices by some vendors (Android 4.4+), the default UI theme will have translucent system UI which is placed on top of the main activity layout. When this is unexpected, it may lead to the system UI overlapping with the application's UI on these devices. By default we tell Android to account for the system UI in the main activity's layout, so that the window contents are positioned outside of it. This is done with a new outermost layout which is just used to size the QtLayout correctly. Since there is a use case where people explicitly want translucency on the system UI and have adapted its contents to accommodate for this, we supply the android.app.allow_overlapping_system_ui setting which can be set to true in the AndroidManifest.xml to override the default behavior. [ChangeLog][Android] On devices with translucent system UI, Qt's window is now positioned to avoid overlap with this by default. This behavior can be overridden in the application's AndroidManifest.xml. Change-Id: I2b34e948f3bd655f883f30b0419d9c6ba69242be Task-number: QTBUG-38700 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
* Android: Make sure applicationState is set correctlyBogDan Vatra2015-03-051-1/+1
| | | | | | | | | | The Activity onResume function is always called before the application gets initialized and we let the applicationState set to the default value which is AppicationInactive. Change-Id: Ifc3c7e3dfc51f2b821f8ca87f8b711f485b6a6f8 Reviewed-by: Peter Rustler <peter.rustler@basyskom.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Fixed license headersJani Heikkinen2015-02-171-1/+1
| | | | | Change-Id: Ibebe1318d1c2de97601aa07269705c87737083ee Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Update copyright headersJani Heikkinen2015-02-111-22/+14
| | | | | | | | | | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Outdated header.LGPL removed (use header.LGPL21 instead) Old header.LGPL3 renamed to header.LGPL3-COMM to match actual licensing combination. New header.LGPL-COMM taken in the use file which were using old header.LGPL3 (src/plugins/platforms/android/extract.cpp) Added new header.LGPL3 containing Commercial + LGPLv3 + GPLv2 license combination Change-Id: I6f49b819a8a20cc4f88b794a8f6726d975e8ffbe Reviewed-by: Matti Paaso <matti.paaso@theqtcompany.com>
* Added new private API for Android and onNewIntentPeter Rustler2015-01-211-0/+5
| | | | | | | | | | | | | On Android the foreground activity can get intents with onNewIntent. Those intents can not be received in any other way. This is especially true in Android nfc. This patch adds a way to receive those intents in Qt. This patch heavily leans on the implementation of onActivityResult. Change-Id: Ic4dca301f34afe9a528149c3653e545ed3265a3c Reviewed-by: BogDan Vatra <bogdan@kde.org> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Make ImhNoPredictiveText work on Samsung devicesPaul Olav Tvete2014-12-121-1/+1
| | | | | | | | | | | Samsung does not support TYPE_TEXT_FLAG_NO_SUGGESTIONS, even though that flag was introduced in API level 5. Therefore, we have to use TYPE_TEXT_VARIATION_VISIBLE_PASSWORD. This effectively makes ImhNoPredictiveText a synonym for ImhSensitiveData on Android. Task-number: QTBUG-43297 Change-Id: I3e7139d144276462e46512445ad7b8e7114d8e32 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* Do not initialize accessibility code by default on startup.Jan Arve Saether2014-12-091-39/+16
| | | | | | | | | | | Instead listen for if the accessibility service is running or not by implementing AccessibilityStateChangeListener. This seems to work smoothly when turning on or off TalkBack. This should also improve startup time. Change-Id: I3eb7d6cb9c9c1618afbb59675e4e089c9159019c Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* Draw the accessibility focus rectangle properlyJan Arve Saether2014-12-051-3/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the accessibility focus rectangle was only visible when it overlapped with the m_editText View of QtActivityDelegate. The reason for this is not completely verified, but this is the most likely reason: * The SurfaceView and QtLayout (ViewGroup) does not do any drawing themselves. Due to this their default value of the View::willNotDraw property is true. Because of this Android might assume there is no content for the focus indicator to surround. (This was verified with setting the willNotDraw property to false on the accessibility view); * Another possible reason could be that overlays does not work for SurfaceView. It is documented that overlays does not work for SurfaceViews, so therefore it tried to use the overlay of another view. For some reason it picked the m_editText overlay instead of the QtLayout overlay. See here about overlay: http://developer.android.com/reference/android/view/View.html#getOverlay() The solution is to add another View that covers the whole screen, which will be used solely by android to draw the accessibility focus indicator. In addition, we change the QtAccessibilityDelegate to no longer have the SurfaceView as a host, but have the m_accView as a host (the host can be freely changed, since all accessibility nodes are virtualized through the delegate anyway) For the record, this will be the current ordering of views in QtLayout: (back-to-front order): Qty Default Qty * Surface View(s) >= 1 1 * Accessibility View == 1 1 * Native View(s) >= 0 1 * m_editText View == 1 1 where the m_editText migth be interleaved among the Native Views. [ChangeLog][Android][Accessibility] Fixed an issue where the accessibility focus rectangle was not drawn properly Task-number: QTBUG-38869 Change-Id: I64d6b6ec45b27d0d93ac9dd840de764c18c55d04 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* Remove unneeded call to m_editText.bringToFront()Jan Arve Saether2014-12-021-1/+0
| | | | | | | | | There is no need to call bringToFront() when the item was just made to be the last child in the two previous lines. (Child views are ordered in stacking/paint order) Change-Id: Ie9fbe5de6dce2bbc96cd44a8a6a779504cd0becd Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* Make sure that created surfaces are stacked on top of previous ones.Jan Arve Saether2014-12-021-5/+12
| | | | | | | | | | | | | The old code would stack the new surface just below the topmost surface. It also did not consider if the m_editText was added to the layout or not (thus, m_layout.getChildCount() - m_nativeViews.size() - 1) was only correct if the editText was added. Spotted by plain code reading while investigating some accessiblity issues. Change-Id: I12c9f373a471c0a7ee624a47232e8952d69c9067 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* Android: Use LocalServerSocket instead of ServerSocketBogDan Vatra2014-11-201-21/+32
| | | | | | | | | | | Using LocalServerSocket is way much safer than ServerSocket because is not using ports which might be in use by other applications. Change-Id: I0e2be0b4561362939950861024f1f95ab819f2c2 Reviewed-by: BogDan Vatra <bogdan@kde.org> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Fix QtCreator debugging on Android 5.0 devicesAlex Blasche2014-11-191-0/+75
| | | | | | | | | | | | | Add a socket based handshake method for gdb. The previous file based method remains for now and can be activated from Qt creator. It will be used by older creator builds but has the limitation of not working on 5.0 devices. The new mechanism works on pre 5.0 devices too. Task-number: QTCREATORBUG-13418 Change-Id: Ia3ecd1b144b544f52d90940ca885653bcbc477ac Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Android: Fix input method hints.Christian Strømme2014-11-031-16/+19
| | | | | | | | | | | | 1. Add comment about the magic TYPE_NUMBER_VARIATION_PASSWORD value. 2. ImhHiddenText, ImhNoPredictiveText and ImhSensitiveData should all disable suggestions. 3. Only ImhSensitiveData sets TYPE_TEXT_VARIATION_VISIBLE_PASSWORD 4. Don't OR date and time to get DateTime... Task-number: QTBUG-38080 Change-Id: If456563983130e9af409ffa8cb717ddf259f1d6b Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Android: QtActivitiyDelegate: extras can be nullShawn Rutledge2014-10-291-158/+158
| | | | | Change-Id: I3b31cc499067540e6ad7b6d05df75d9ba0e1e615 Reviewed-by: BogDan Vatra <bogdan@kde.org>
* Allow QtCreator to pass additional args and env vars to the application.BogDan Vatra2014-10-231-0/+17
| | | | | | | | | We need them to allow developers to easily pass args and env. vars like QSG_RENDER_TIMINGS, QSG_VISUALIZE to theirs apps. The env vars and params must be base64 encoded! Change-Id: I1d781873ffdc6efd40b30543a9fd2514bbdede43 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Android: Don't call requestLayout() when changing the geometry.Christian Strømme2014-10-091-2/+0
| | | | | | | | requestLayout() is already called when setLayoutParams() is called, so calling it again is extremely wasteful. Change-Id: Iddfb488830a6b7277a653a84ffacabf966baf0b5 Reviewed-by: BogDan Vatra <bogdan@kde.org>
* Use PopupMenu when possible.BogDan Vatra2014-10-011-7/+21
| | | | | | | | | | | | On API-11+ we are going to use PopupMenu instead of ContextMenu to show context menus. A PopupMenu displays a Menu in a modal popup window anchored to a View. The popup will appear below the anchor view if there is room, or above it if there is not. Task-number: QTBUG-39736 Change-Id: Ie412ab0935b868348ce5c8bb0bf53571ffefd582 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Android: Add function to change the stacking order in the layout.Christian Strømme2014-09-261-0/+29
| | | | | | | | | | | | | This change enables us to reorder the stacking order used by the layout. This is necessary if we want to influence the drawing order. Lowering or raising views are done separately for native views and Qt surface views, that is, the two different view "types" are moved relative to other views of the same type and Native views are always placed on top. Change-Id: I01cbb88f8efee08877b5972cf330fd25266a2aa9 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Android: Improve the foreign-window implementationChristian Strømme2014-09-261-5/+6
| | | | | | | | | | | | Adds: - Improved geometry calculations (e.g, inside a parent) - Change visibility - proper stacking order. Native views now reserve the top of the stack to ensure that they stay visible. - React to application state changes. Change-Id: I35de0396937fff37ffcd272c9a7d8e9873a91dfb Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-09-231-5/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The isAlwaysAskOption was removed in 38621713150b663355ebeb799a5a50d8e39a3c38 so manually removed code in src/plugins/bearer/connman/qconnmanengine.cpp Conflicts: src/corelib/global/qglobal.h src/corelib/tools/qcollator_macx.cpp src/corelib/tools/qstring.cpp src/gui/kernel/qwindow.cpp src/gui/kernel/qwindow_p.h src/gui/text/qtextengine.cpp src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig_p.h src/plugins/platforms/android/qandroidinputcontext.cpp src/plugins/platforms/xcb/qglxintegration.cpp src/plugins/platforms/xcb/qglxintegration.h src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/testlib/qtestcase.cpp src/testlib/qtestlog.cpp src/widgets/dialogs/qfiledialog.cpp src/widgets/kernel/qwindowcontainer.cpp tests/auto/corelib/tools/qcollator/tst_qcollator.cpp tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp Change-Id: Ic5d4187f682257a17509f6cd28d2836c6cfe2fc8
| * Android: Avoid deadlock in Qt.inputMethod.visiblePaul Olav Tvete2014-09-021-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | A blocking isSoftwareKeyboardVisible() is a deadlock waiting to happen: when the android input method performs blocking metacalls from the android thread to the GUI thread all the time, we cannot block the GUI thread waiting for the android thread. Task-number: QTBUG-40750 Change-Id: I2490897b0f65e0d92214907e239b10b372d949dd Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* | Respect android:windowSoftInputMode in manifest.Samuel Nevala2014-09-041-3/+13
| | | | | | | | | | | | | | | | | | | | | | Read and store softInputMode set at AndroidManifest.xml on QtActivityDelegate. When showSoftwareKeyboard is requested setSoftInputMode for main window if softInputMode is not defined fall back to old behavior. Change-Id: I71cb27d4bdb4ae4e3c2a0706560173703a2f5a50 Task-number: QTBUG-34401 Reviewed-by: BogDan Vatra <bogdan@kde.org> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* | Android: Guard against invalid surfaceIDPaul Olav Tvete2014-09-021-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not try to resize or destroy invalid surfaces. This caused update problems with all GL apps after suspend, since we would forget the dummy view that we always keep around so we get proper transitions on shutdown. Also make sure that we don't mess this up even if we try to destroy a non-existing surface. This would have fixed the bug by itself, but then we would still be stuck with the annoying warning message. Task-number: QTBUG-41093 Change-Id: I83299e93eb9ac5357b98ca47014789b56c91b35a Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* | Forward menu button events to Qt if there is no visible menubar.BogDan Vatra2014-08-161-18/+0
| | | | | | | | | | | | Task-number: QTBUG-32334 Change-Id: If1b4517f233b04d4c6c165cbfe62c8cf7b624c60 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* | Android: Say hello to gradle!BogDan Vatra2014-08-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add build.gradle script, move Android template files to another folder. These files are specific to every project, and they should be copied to then project android folder. Switching from Ant to Gradle brings lots of advantages: - it is way faster when rebuilding (25-50% faster than ant). - it enables first class Android Studio integration. - adding Android Extras libs (e.g. Google Play services, OBB, etc.) to your project is now painless. [ChangeLog][Android] Added Gradle support to build the APK. Change-Id: I9c8cb355118c9ac1997270c8b80916eca43fce4d Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | Android: Fix debugging.BogDan Vatra2014-08-061-0/+7
| | | | | | | | | | | | | | | | | | | | When re-install a package without uninstalling it first, a few files are leftover from the previous installation which makes the debugging to fail. Change-Id: I603491668bcec2a6f8054951ea2dea806fcc4c88 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-07-141-0/+1
|\| | | | | | | | | | | | | Conflicts: src/gui/text/qfontengine_qpf2.cpp Change-Id: Ib04f92c41d0edd55d3aef8fb1708d917fba0f2a8
| * Android: Prefer "Droid Serif" as default serif fontEskil Abrahamsen Blomfeldt2014-07-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | I've also updated the qfont test so it passes on Android now. Note that there are no suitable cursive/fantasy fonts on Android, so the regular default "Roboto" (or "Droid Sans" on older devices) will be picked here instead. [ChangeLog][Android] Fixed font selection to prefer "Droid Serif" when Serif style hint is set on QFont. Change-Id: I294eebcc4d79410e435bdddce552acc6044753b2 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* | Android: fix typo in QtActivityDelegate.javaJ-P Nurmi2014-06-091-4/+4
| | | | | | | | | | Change-Id: I6704627ed0bf7cb70a09c1637084ed2c8e5031cf Reviewed-by: BogDan Vatra <bogdan@kde.org>
* | Merge remote-tracking branch 'origin/stable' into devJ-P Nurmi2014-06-051-6/+27
|\| | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/features/qt.prf src/plugins/platforms/xcb/qxcbwindow.h src/tools/qdoc/qdocindexfiles.cpp src/widgets/kernel/qwidget_qpa.cpp Change-Id: I214f57b03bc2ff86cf3b7dfe2966168af93a5a67
| * Android: Fix flashing on startup/shutdownEskil Abrahamsen Blomfeldt2014-06-041-6/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were several issues on startup of the application which were caused by the fact that we would get the wrong available screen geometry on startup, set this as the initial surface size and then expose native windows with this size. This would cause first a flicker of white on the early expose and the window contents to jump around as the window was resized to the actual available space on screen. The fix for this is to postpone the first expose until we have actually got a proper screen size from the main layout. We use width,height = 0 as an indicator that the available geometry is not yet known, and we skip posting any expose events before this is set by the layout. In addition, since we removed the surface before we shut down the application, it was by a white rectangle before the shutdown transition happens, and this white rectangle will be animated instead of application contents. To rectify this, we make sure the last surface in the stack remains in the layout until it is either replaced by a different surface or until the application has shut down. This way, the shutdown animation will work on this surface instead. [ChangeLog][Android] Fixed regression where there would be flickering on startup and shutdown of the application. Task-number: QTBUG-38960 Change-Id: Ia1579ca8c522d8beeab066f78070ad49009d0238 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 04:10:52 +0000