Merge lp://qastaging/camera-app/staging into lp://qastaging/camera-app
Proposed by
Florian Boucault
| Status: | Merged | ||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Approved by: | Florian Boucault | ||||||||||||||||||||||||||||||||
| Approved revision: | 686 | ||||||||||||||||||||||||||||||||
| Merged at revision: | 643 | ||||||||||||||||||||||||||||||||
| Proposed branch: | lp://qastaging/camera-app/staging | ||||||||||||||||||||||||||||||||
| Merge into: | lp://qastaging/camera-app | ||||||||||||||||||||||||||||||||
| Diff against target: |
1655 lines (+587/-221) 25 files modified
GalleryView.qml (+4/-4) GalleryViewHeader.qml (+3/-0) MimeTypeMapper.js (+1/-1) OptionButton.qml (+2/-2) PhotogridView.qml (+42/-6) SlideshowView.qml (+16/-6) UnableShareDialog.qml (+34/-0) ViewFinderOverlay.qml (+16/-9) ViewFinderOverlayLoader.qml (+3/-1) ViewFinderView.qml (+14/-15) camera-app.qml (+41/-18) debian/control (+3/-0) tests/autopilot/camera_app/emulators/main_window.py (+77/-9) tests/autopilot/camera_app/emulators/panel.py (+8/-2) tests/autopilot/camera_app/tests/__init__.py (+14/-8) tests/autopilot/camera_app/tests/test_capture.py (+67/-20) tests/autopilot/camera_app/tests/test_diskspace.py (+4/-7) tests/autopilot/camera_app/tests/test_flash.py (+12/-13) tests/autopilot/camera_app/tests/test_focus.py (+17/-18) tests/autopilot/camera_app/tests/test_gallery_view.py (+118/-41) tests/autopilot/camera_app/tests/test_options.py (+0/-8) tests/autopilot/camera_app/tests/test_photo_editor.py (+2/-22) tests/autopilot/camera_app/tests/test_zoom.py (+0/-10) tests/unittests/CMakeLists.txt (+1/-1) tests/unittests/tst_PhotogridView.qml (+88/-0) |
||||||||||||||||||||||||||||||||
| To merge this branch: | bzr merge lp://qastaging/camera-app/staging | ||||||||||||||||||||||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Phablet Team | Pending | ||
|
Review via email:
|
|||
Commit message
New release:
- Only accept manual focus on points inside the viewfinder.
- viewFinderView.
- Disable controls and prevent navigation while a delayed/timed shoot is ongoing.
- Display a stock icon as the video thumbnail when thumbnailer fails (which it will do now if it can't process a video)
- Allow sharing multiple files, except if they are mixed content
- Only use full screen in staged mode.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
