Merge into trunk : staging : Code : camera-app

Status:

Merged

Approved by:

Florian Boucault on 2016-02-26

Approved revision:

658

Merged at revision:

636

Proposed branch:

lp://qastaging/camera-app/staging

Merge into:

lp://qastaging/camera-app

Diff against target:

2752 lines (+657/-1424)

31 files modified

BottomEdgeIndicators.qml (+1/-1)
CameraApp/CMakeLists.txt (+2/-4)
CameraApp/advancedcamerasettings.cpp (+3/-3)
CameraApp/components.cpp (+9/-0)
CameraApp/qstorageinfo.cpp (+0/-378)
CameraApp/qstorageinfo.h (+0/-102)
CameraApp/qstorageinfo_p.h (+0/-84)
CameraApp/qstorageinfo_unix.cpp (+0/-442)
CameraApp/storagelocations.cpp (+121/-0)
CameraApp/storagelocations.h (+50/-0)
CameraApp/storagemonitor.cpp (+34/-1)
CameraApp/storagemonitor.h (+5/-0)
GalleryView.qml (+3/-3)
GalleryViewHeader.qml (+3/-3)
PictureReview.qml (+46/-0)
ProcessingFeedback.qml (+43/-0)
SharePopover.qml (+1/-9)
Snapshot.qml (+0/-98)
ViewFinderExportConfirmation.qml (+40/-21)
ViewFinderOverlay.qml (+103/-40)
ViewFinderOverlayLoader.qml (+4/-1)
ViewFinderView.qml (+112/-65)
cameraapplication.cpp (+0/-106)
cameraapplication.h (+0/-15)
debian/rules (+0/-4)
manifest.json.in (+1/-1)
run_tests.sh (+0/-13)
tests/autopilot/camera_app/tests/test_focus.py (+32/-28)
tests/autopilot/camera_app/tests/test_options.py (+27/-0)
tests/unittests/CMakeLists.txt (+1/-0)
tests/unittests/qstorageinfo_stub.cpp (+16/-2)

To merge this branch:

bzr merge lp://qastaging/camera-app/staging

Related bugs:

Bug #1563858: Cannot open camera controls in landscape mode	High	Fix Released
Bug #1572576: Taking a photo not working / xenial	Critical	Fix Released
Bug #1584524: camera app gets baffled when maximising desktop version	High	Fix Released
Bug #1585942: Mesa causes a segmentation fault on arm64 (wrong count of uniform locations)	Critical	Fix Released
Bug #1595082: Cannot preview in 16.04 desktop	High	Fix Released
Bug #1615657: Reverse portrait orientation broken on BQ M10	Medium	Fix Released
Bug #1629009: Does not work inside a snap due to hardcoded paths	High	Fix Released
Bug #1649932: crashes when opening from the peer picker on unity8 desktop	Undecided	New

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2016-02-26
Ubuntu Phablet Team		2016-01-29	Pending
Review via email: mp+284427@code.qastaging.launchpad.net

Commit message

New release:
- Allow tap to focus up to the left/right edge of the screen
- Query the manual focus support to enable/disable tap-to-focus as the backend supports it
- Do not crash if no QCameraExposureControl is available (true with Unity 7)
- Before setting a photo capture resolution, always checks it is included in the possible resolution options
- Fix bottom edge mouse handling: ensure that clicks on the bottom edge open it and that any click outside of option buttons dismiss the bottom edge
- Various performance improvements to minimize the time between shots and between pressing the shutter button and the actual capture
- When the GPS fix is accurate to less than 100m display the GPS icon in red and don't save location
- Display error messages when disk write fails and when SD card is not writeable when switching to it
- Disable record/shuttle button while PhotoRoll hint is visible