summaryrefslogtreecommitdiffstats
path: root/src/plugins/android/src
Commit message (Expand)AuthorAgeFilesLines
...
* Merge remote-tracking branch 'origin/5.4' into 5.5Yoann Lopes2015-05-052-17/+13
|\
| * Android: Don't delete the media recorder object twice.Christian Strømme2015-04-302-17/+13
* | QMediaPlayer: handle resource files in a cross-platform way.Yoann Lopes2015-04-077-34/+16
* | Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-03-171-2/+2
|\|
| * Android: fix some MediaPlayer signals not being emitted on first load.Yoann Lopes2015-03-041-2/+2
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-02-132-10/+15
|\|
| * Android: fix adjusting camera viewfinder resolution.Yoann Lopes2015-02-111-9/+14
| * Encode urls passed to media player properlyJoni Poikelin2015-02-101-1/+1
* | Update copyright headersAntti Kokko2015-02-1269-483/+483
* | Add additional exposure modes to QCameraExposure.Andrew den Exter2014-11-281-0/+50
|/
* Android: Use the new findClass() method.Christian Strømme2014-10-174-73/+60
* Android: fix some problems with the media player.Yoann Lopes2014-09-262-62/+69
* Android: fix QMediaPlayer's state and mediaStatus signals.Yoann Lopes2014-09-242-3/+53
* Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-09-017-47/+113
|\
| * Android: fix retrieving metadata from assets, qrc and remote files.Yoann Lopes2014-08-257-47/+113
* | Update license headers and add new license filesAntti Kokko2014-08-2469-1305/+753
|/
* Android: Make sure we check and clear exceptions from the camera.Christian Strømme2014-07-143-36/+59
* Android: fix setting camera parameters from QML.Yoann Lopes2014-07-108-136/+189
* Android: fix crash when stopping the camera while a recording is activeYoann Lopes2014-06-301-1/+2
* Android: fix registering recorded videos with the Android media scannerYoann Lopes2014-06-301-1/+1
* Android: correctly update camera focus zones.Yoann Lopes2014-06-301-15/+14
* Android: Use a file descriptor for all local media files.Christian Strømme2014-06-051-1/+1
* Android: don't start camera preview until the viewfinder is ready.Yoann Lopes2014-06-052-12/+26
* Android: Don't expose java calls in the control classes.Christian Strømme2014-06-0415-114/+238
* Android: Rename the wrapper classesChristian Strømme2014-06-0434-533/+533
* Android: fix calling start() and stop() on the video surface.Yoann Lopes2014-05-301-1/+1
* Android: Fix loading from qrcChristian Strømme2014-05-211-1/+1
* Android: fix QMediaPlayer::bufferStatus value.Yoann Lopes2014-05-152-3/+17
* Android: Fix namespace usage.Christian Strømme2014-05-125-6/+12
* Moved QMediaStorageLocation out of the Android plugin.Yoann Lopes2014-05-097-218/+23
* Merge remote-tracking branch 'origin/release' into stableJani Heikkinen2014-04-231-2/+8
|\
| * Android: Release the surface texture when not in useChristian Strømme2014-04-121-2/+8
* | Android: Camera code clean-upChristian Strømme2014-04-152-195/+283
* | Android: Use QMutexLock in camera callbacks.Christian Strømme2014-04-151-8/+4
|/
* Android: Use Q_GLOBAL_STATIC instead of a static QMapChristian Strømme2014-04-091-5/+6
* Android: Fix the signature for setOnInfoListener.Christian Strømme2014-04-091-1/+1
* Android: Fix QtMediaRecorderChristian Strømme2014-04-081-6/+14
* Android: Use androidSdkVersion() to get the API level.Christian Strømme2014-04-081-31/+39
* Android: Remove inheritance to QJNIObject in the Camera wrapperChristian Strømme2014-04-081-22/+25
* Android: Fix MediaRecorder wrapperChristian Strømme2014-04-082-24/+25
* Android: Clean-up in jmultimediautils class.Christian Strømme2014-03-273-36/+15
* Android: Fix MetadataRetriver wrapperChristian Strømme2014-03-273-23/+29
* Android: Fix QtSurfaceTextureChristian Strømme2014-03-278-163/+76
* Android: Don't call release() unless it's necessary.Christian Strømme2014-03-271-1/+3
* Android: Fix reload check in onStateChanged().Christian Strømme2014-03-271-1/+3
* Android: Make the Mediaplayer more robustChristian Strømme2014-03-217-235/+407
* Android: fix QMediaRecorder failing to start in some cases.Yoann Lopes2014-03-171-2/+6
* Android: print Java traces for MediaRecorder when in debug mode.Yoann Lopes2014-03-171-10/+56
* Android: restart camera viewfinder after a recorder error.Yoann Lopes2014-03-172-9/+15
* Android: correctly report QMediaRecorder actual output location.Yoann Lopes2014-03-172-6/+5