camera-app

Merge lp://qastaging/~artmello/camera-app/camera-app-multi_selection into lp://qastaging/camera-app

camera-app-multi_selection
Merge into trunk

Proposed by Arthur Mello on 2014-10-31

Status:	Superseded
Proposed branch:	lp://qastaging/~artmello/camera-app/camera-app-multi_selection
Merge into:	lp://qastaging/camera-app
Diff against target:	748 lines (+409/-105) 9 files modified CameraApp/foldersmodel.cpp (+8/-0) CameraApp/foldersmodel.h (+1/-0) DeleteDialog.qml (+47/-0) GalleryView.qml (+101/-6) GalleryViewHeader.qml (+27/-2) PhotogridView.qml (+44/-6) SharePopover.qml (+61/-0) SlideshowView.qml (+18/-54) tests/autopilot/camera_app/tests/test_gallery_view.py (+102/-37)
To merge this branch:	bzr merge lp://qastaging/~artmello/camera-app/camera-app-multi_selection
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Bill Filler (community)			Needs Fixing on 2014-12-01
Florian Boucault (community)		2014-10-31	Approve on 2014-11-26
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-11-26
Review via email: mp+240320@code.qastaging.launchpad.net

This proposal has been superseded by a proposal from 2014-12-02.

Commit message

Add support to multi selection on grid view when triggered by the user

Description of the change

Add support to multi selection on grid view when triggered by the user

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-31:

#

FAILED: Continuous integration, rev:412
http://jenkins.qa.ubuntu.com/job/camera-app-ci/301/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-amd64-ci/117/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/117/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-i386-ci/117/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/496/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4254/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/860/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4646/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/301/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Florian Boucault (fboucault) wrote on 2014-11-04:

#

Merge has conflicts

review: Needs Fixing

Revision history for this message

Florian Boucault (fboucault) wrote on 2014-11-04:

#

Share and delete dialogs seem to be copy/paste code from elsewhere?

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-11-05:

#

PASSED: Continuous integration, rev:413
http://jenkins.qa.ubuntu.com/job/camera-app-ci/304/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-amd64-ci/120
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/120
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/120/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-i386-ci/120
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/502
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4303
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/650
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/868
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15480
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3654
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4697
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4697/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/304/rebuild

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-11-12:

#

FAILED: Continuous integration, rev:420
http://jenkins.qa.ubuntu.com/job/camera-app-ci/305/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/1/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/1
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/12/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/113
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/655/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/29
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15762
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/102
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/117
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/117/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/305/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-11-17:

#

FAILED: Continuous integration, rev:420
http://jenkins.qa.ubuntu.com/job/camera-app-ci/306/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/2/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/2
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/13
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/152
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/656
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/30
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15887
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/131
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/156
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/156/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/306/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Florian Boucault (fboucault) wrote on 2014-11-17:

#

singleSelectionOnly needs to be set to false when activating multi selection by long pressing a photo.

review: Needs Fixing

Revision history for this message

Florian Boucault (fboucault) wrote on 2014-11-17:

#

What was the point of not having the entire thumbnail area being selectable, ie. tapping anywhere in a photo thumbnail while in multi select mode to add/remove the photo from the selection? I can't remember.

Revision history for this message

Arthur Mello (artmello) wrote on 2014-11-17:

#

> What was the point of not having the entire thumbnail area being selectable,
> ie. tapping anywhere in a photo thumbnail while in multi select mode to
> add/remove the photo from the selection? I can't remember.

We discussed during the sprint that having the option to view the full photo and not only the thumbnail during a multi selection would be a good feature. But we didn't have a final word if the small check square would be the best way to set a photo as selected.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-11-18:

#

FAILED: Continuous integration, rev:422
http://jenkins.qa.ubuntu.com/job/camera-app-ci/311/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/7/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/7
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/19
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/170
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/662
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/36
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15922
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/147
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/173
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/173/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/311/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Florian Boucault (fboucault) wrote on 2014-11-18:

#

Looks good now, thanks.

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-11-24:

#

FAILED: Continuous integration, rev:422
http://jenkins.qa.ubuntu.com/job/camera-app-ci/316/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/12
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/12/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/24
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/223
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/667
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/44
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16193
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/195
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/227
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/227/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/316/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Bill Filler (bfiller) wrote on 2014-11-24:

#

I found a few problems with this MR in testing:

1) Long pressing an image causes the Share/Delete menu to be briefly shown then hidden
2) Select two images, then tap on a third one to view it. When you return to selection mode the previous selections are no longer selected as they should be. Then you can only single select from that point.
3) There should be a "select all" toggle button on the toolbar that toggles select all/select none. See address-book-app. This should perform the same way.
4) I found it's too easy to accidentally tap the photo to open it when I was trying to check the selection button. Maybe leave the visual size of the selection box the same but make a bigger touch area around such that we can increase the hit size without having to make the box bigger visually.

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-11-24:

#

FAILED: Continuous integration, rev:428
http://jenkins.qa.ubuntu.com/job/camera-app-ci/317/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/13
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/13/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/13
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/25
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/225
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/668
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/45
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16196
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/197
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/229
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/229/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/317/rebuild

review: Needs Fixing (continuous-integration)

lp://qastaging/~artmello/camera-app/camera-app-multi_selection updated on 2014-11-26

429. By Arthur Mello on 2014-11-25: Merge with trunk
430. By Arthur Mello on 2014-11-25: Does not display the actionsDrawer while initializing it
431. By Arthur Mello on 2014-11-25: Does not chamge the single selection property from model after viewing an image on select mode
432. By Arthur Mello on 2014-11-26: Add a select all button when at the selectionMode in the grid view
433. By Arthur Mello on 2014-11-26: Expand the MouseArea for toggling select on the photo grid

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-11-26:

#

FAILED: Continuous integration, rev:433
http://jenkins.qa.ubuntu.com/job/camera-app-ci/320/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/16
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/16/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/16
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/29
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/238
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/672
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/49
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16274
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/210
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/243
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/243/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/320/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Arthur Mello (artmello) wrote on 2014-11-26:

#

All the issues commented by Bill seems to be fixed based on the tests I did on the device. Related with the issue #4 I increased the MouseArea for toggling photo selection to be the full top right quarter of the thumbnail (but did not increased the selection icon itself). Please, let me know if that fix the problem.

Revision history for this message

Florian Boucault (fboucault) wrote on 2014-11-26:

#

It looks like it's working fine now. Code is as expected.

review: Approve

Revision history for this message

Bill Filler (bfiller) wrote on 2014-12-01:

#

works well, but found one small issue. The share action should be disabled if multiple pictures selected as sharing is currently only supported for a single picture in the clients that support it (messaging-app and facebook)

review: Needs Fixing

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes:

Arthur Mello

Ubuntu Phablet Team

deaunapaul