Merge lp:camera-app/staging into lp:camera-app

[Florian Boucault]

New release:
- Only accept manual focus on points inside the viewfinder.
- viewFinderView.captureMode can now be set before the camera is ready. Take advantage of that to fix bug #1545123
- 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.

=== modified file 'GalleryView.qml'
--- GalleryView.qml	2016-02-23 11:46:52 +0000
+++ GalleryView.qml	2016-03-23 15:42:41 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.4
 import Ubuntu.Components 1.3
-import Ubuntu.Content 0.1
+import Ubuntu.Content 1.3
 import Ubuntu.Thumbnailer 0.1
 import CameraApp 0.1
 import "MimeTypeMapper.js" as MimeTypeMapper
@@ -35,7 +35,7 @@
                   StorageLocations.removableStorageVideosLocation]
         typeFilters: !main.contentExportMode ? [ "image", "video" ]
                                               : [MimeTypeMapper.contentTypeToMimeType(main.transferContentType)]
-        singleSelectionOnly: main.transfer.selectionType === ContentTransfer.Single
+        singleSelectionOnly: main.contentExportMode && main.transfer.selectionType === ContentTransfer.Single
     }
 
     property bool gridMode: main.contentExportMode
@@ -58,7 +58,6 @@
 
     function exitUserSelectionMode() {
         model.clearSelection();
-        model.singleSelectionOnly = true;
         userSelectionMode = false;
     }
 
@@ -76,6 +75,7 @@
             model: galleryView.model
             visible: opacity != 0.0
             inView: galleryView.inView && galleryView.currentView == slideshowView
+            focus: inView
             inSelectionMode: main.contentExportMode || galleryView.userSelectionMode
             onToggleSelection: model.toggleSelected(currentIndex)
             onToggleHeader: header.toggle();
@@ -89,6 +89,7 @@
             model: galleryView.model
             visible: opacity != 0.0
             inView: galleryView.inView && galleryView.currentView == photogridView
+            focus: inView
             inSelectionMode: main.contentExportMode || galleryView.userSelectionMode
             onPhotoClicked: {
                 slideshowView.showPhotoAtIndex(index);
@@ -97,7 +98,6 @@
             onPhotoPressAndHold: {
                 if (!galleryView.userSelectionMode) {
                     galleryView.userSelectionMode = true;
-                    model.singleSelectionOnly = false;
                     model.toggleSelected(index);
                 }
             }

=== modified file 'GalleryViewHeader.qml'
--- GalleryViewHeader.qml	2016-02-25 13:01:05 +0000
+++ GalleryViewHeader.qml	2016-03-23 15:42:41 +0000
@@ -153,6 +153,7 @@
 
     Item {
         id: actionsDrawer
+        objectName: "actionsDrawer"
 
         anchors {
             top: parent.bottom
@@ -170,6 +171,8 @@
         }
 
         property bool opened: false
+        property bool fullyOpened: actionsColumn.y == 0
+        property bool fullyClosed: actionsColumn.y == -actionsColumn.height
         property list<Action> actions
 
         onOpenedChanged: {

=== modified file 'MimeTypeMapper.js'
--- MimeTypeMapper.js	2014-07-31 18:41:17 +0000
+++ MimeTypeMapper.js	2016-03-23 15:42:41 +0000
@@ -17,7 +17,7 @@
 */
 
 .pragma library
-.import Ubuntu.Content 0.1 as UbuntuContent
+.import Ubuntu.Content 1.3 as UbuntuContent
 
 function startsWith(string, prefix) {
     return string.indexOf(prefix) === 0;

=== modified file 'OptionButton.qml'
--- OptionButton.qml	2015-11-24 15:44:58 +0000
+++ OptionButton.qml	2016-03-23 15:42:41 +0000
@@ -26,8 +26,8 @@
     iconName: !model.get(model.selectedIndex).icon ? model.icon : model.get(model.selectedIndex).icon
     iconSource: (model && model.iconSource) ? model.iconSource : ""
     on: model.isToggle ? model.get(model.selectedIndex).value : true
-    enabled: model.available
+    enabled: model.visible && model.available
     label: model.label
-    visible: model.visible
+    visible: model.visible && model.available
     automaticOrientation: false
 }

=== modified file 'PhotogridView.qml'
--- PhotogridView.qml	2016-02-23 11:46:52 +0000
+++ PhotogridView.qml	2016-03-23 15:42:41 +0000
@@ -18,11 +18,11 @@
 import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.3
 import Ubuntu.Thumbnailer 0.1
-import Ubuntu.Content 0.1
+import Ubuntu.Content 1.3
 import CameraApp 0.1
 import "MimeTypeMapper.js" as MimeTypeMapper
 
-Item {
+FocusScope {
     id: photogridView
 
     property var model
@@ -40,11 +40,14 @@
         Action {
             text: i18n.tr("Share")
             iconName: "share"
-            enabled: model.selectedFiles.length <= 1
+            enabled: model.selectedFiles.length > 0
             onTriggered: {
-                if (model.selectedFiles.length > 0) {
-                    var dialog = PopupUtils.open(sharePopoverComponent)
-                    dialog.parent = photogridView
+                // Display a warning message if we are attempting to share mixed
+                // content, as the framework does not properly support this
+                if (selectionContainsMixedMedia()) {
+                    PopupUtils.open(unableShareDialogComponent).parent = photogridView;
+                } else {
+                    PopupUtils.open(sharePopoverComponent).parent = photogridView;
                 }
             }
         },
@@ -60,6 +63,19 @@
         }
     ]
 
+    function selectionContainsMixedMedia() {
+        var selection = model.selectedFiles;
+        var lastType = model.get(selection[0], "fileType");
+        for (var i = 1; i < selection.length; i++) {
+            var type = model.get(selection[i], "fileType");
+            if (type !== lastType) {
+                return true;
+            }
+            lastType = type;
+        }
+        return false;
+    }
+
     function showPhotoAtIndex(index) {
         gridView.positionViewAtIndex(index, GridView.Center);
     }
@@ -139,6 +155,16 @@
                 visible: isVideo
             }
 
+            Icon {
+                objectName: "thumbnailLoadingErrorIcon"
+                anchors.centerIn: parent
+                width: units.gu(6)
+                height: width
+                name: cellDelegate.isVideo ? "stock_video" : "stock_image"
+                color: "white"
+                opacity: thumbnail.status == Image.Error ? 1.0 : 0.0
+             }
+
             MouseArea {
                 anchors.fill: parent
                 onClicked: photogridView.photoClicked(index)
@@ -160,6 +186,7 @@
                 visible: inSelectionMode
 
                 Icon {
+                    objectName: "mediaItemCheckBox"
                     anchors.centerIn: parent
                     width: parent.width * 0.8
                     height: parent.height * 0.8
@@ -225,4 +252,13 @@
             onVisibleChanged: photogridView.toggleHeader()
         }
     }
+
+    Component {
+        id: unableShareDialogComponent
+        UnableShareDialog {
+            objectName: "unableShareDialog"
+            onVisibleChanged: photogridView.toggleHeader()
+        }
+    }
+
 }

=== modified file 'SlideshowView.qml'
--- SlideshowView.qml	2016-02-23 11:46:52 +0000
+++ SlideshowView.qml	2016-03-23 15:42:41 +0000
@@ -18,12 +18,12 @@
 import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.3 as ListItems
 import Ubuntu.Components.Popups 1.3
-import Ubuntu.Content 0.1
+import Ubuntu.Content 1.3
 import Ubuntu.Thumbnailer 0.1
 import CameraApp 0.1
 import "MimeTypeMapper.js" as MimeTypeMapper
 
-Item {
+FocusScope {
     id: slideshowView
 
     property var model
@@ -111,14 +111,12 @@
 
         anchors.fill: parent
         model: slideshowView.model
+        focus: true
         orientation: ListView.Horizontal
         boundsBehavior: Flickable.StopAtBounds
         cacheBuffer: width
         highlightRangeMode: ListView.StrictlyEnforceRange
-        // FIXME: this disables the animation introduced by highlightRangeMode
-        // happening setting currentIndex; it is necessary at least because we
-        // were hitting https://bugreports.qt-project.org/browse/QTBUG-41035
-        highlightMoveDuration: 0
+        highlightMoveDuration: UbuntuAnimation.FastDuration
         snapMode: ListView.SnapOneItem
         onCountChanged: {
             // currentIndex is -1 by default and stays so until manually set to something else
@@ -140,6 +138,7 @@
         }
         delegate: Item {
             id: delegate
+            objectName: "mediaItem" + index
             property bool pinchInProgress: zoomPinchArea.active
             property string url: fileURL
             property bool isSelected: selected
@@ -183,6 +182,7 @@
                 property real maximumZoom: 3.0
                 property bool active: false
                 property var center
+                enabled: !media.isVideo
 
                 onPinchStarted: {
                     active = true;
@@ -258,6 +258,16 @@
                             }
                             fillMode: Image.PreserveAspectFit
                         }
+
+                        Icon {
+                            objectName: "thumbnailLoadingErrorIcon"
+                            anchors.centerIn: parent
+                            width: units.gu(30)
+                            height: width
+                            name: media.isVideo ? "stock_video" : "stock_image"
+                            color: "white"
+                            opacity: image.status == Image.Error ? 1.0 : 0.0
+                         }
                     }
 
                     Icon {

=== added file 'UnableShareDialog.qml'
--- UnableShareDialog.qml	1970-01-01 00:00:00 +0000
+++ UnableShareDialog.qml	2016-03-23 15:42:41 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Popups 1.3
+
+Dialog {
+    id: dialog
+    objectName: "unableShareDialog"
+
+    title: i18n.tr("Unable to share")
+    text: i18n.tr("Unable to share photos and videos at the same time")
+
+    Button {
+        objectName: "unableShareDialogOk"
+        text: i18n.tr("Ok")
+        color: UbuntuColors.orange
+        onClicked: PopupUtils.close(dialog);
+    }
+}

=== modified file 'ViewFinderOverlay.qml'
--- ViewFinderOverlay.qml	2016-02-23 11:46:52 +0000
+++ ViewFinderOverlay.qml	2016-03-23 15:42:41 +0000
@@ -33,6 +33,7 @@
     property var controls: controls
     property var settings: settings
     property bool readyForCapture
+    property int sensorOrientation
 
     function showFocusRing(x, y) {
         focusRing.center = Qt.point(x, y);
@@ -289,6 +290,7 @@
         id: bottomEdgeClose
         anchors.fill: parent
         onClicked: optionsOverlayClose()
+        enabled: !camera.timedCaptureInProgress
     }
 
     OrientationHelper {
@@ -305,8 +307,9 @@
             height: optionsOverlayLoader.height
             onOpenedChanged: optionsOverlayLoader.item.closeValueSelector()
             enabled: camera.videoRecorder.recorderState == CameraRecorder.StoppedState
-                     && !camera.photoCaptureInProgress
+                     && !camera.photoCaptureInProgress && !camera.timedCaptureInProgress
             opacity: enabled ? 1.0 : 0.3
+            property bool ready: optionsOverlayLoader.status == Loader.Ready
 
             /* At startup, opened is false and 'bottomEdge.height' is 0 until
                optionsOverlayLoader has finished loading. When that happens
@@ -652,13 +655,15 @@
         enabled: visible
 
         function timedShoot(secs) {
+            camera.timedCaptureInProgress = true;
             timedShootFeedback.start();
             shootingTimer.remainingSecs = secs;
             shootingTimer.start();
         }
 
         function cancelTimedShoot() {
-            if (shootingTimer.running) {
+            if (camera.timedCaptureInProgress) {
+                camera.timedCaptureInProgress = false;
                 shootingTimer.stop();
                 timedShootFeedback.stop();
             }
@@ -692,9 +697,8 @@
                     break;
             }
 
-            if (Screen.primaryOrientation == Qt.PortraitOrientation) {
-                orientation += 90;
-            }
+            // account for the orientation of the sensor
+            orientation -= viewFinderOverlay.sensorOrientation;
 
             if (camera.captureMode == Camera.CaptureVideo) {
                 if (main.contentExportMode) {
@@ -774,6 +778,7 @@
             onTriggered: {
                 if (remainingSecs == 0) {
                     running = false;
+                    camera.timedCaptureInProgress = false;
                     controls.shoot();
                     timedShootFeedback.stop();
                 } else {
@@ -819,7 +824,7 @@
             iconName: (camera.captureMode == Camera.CaptureStillImage) ? "camcorder" : "camera-symbolic"
             onClicked: controls.changeRecordMode()
             enabled: camera.videoRecorder.recorderState == CameraRecorder.StoppedState && !main.contentExportMode
-                     && !camera.photoCaptureInProgress
+                     && !camera.photoCaptureInProgress && !camera.timedCaptureInProgress
         }
 
         ShootButton {
@@ -833,6 +838,7 @@
             }
 
             enabled: viewFinderOverlay.readyForCapture && !storageMonitor.diskSpaceCriticallyLow
+                     && !camera.timedCaptureInProgress
             state: (camera.captureMode == Camera.CaptureVideo) ?
                    ((camera.videoRecorder.recorderState == CameraRecorder.StoppedState) ? "record_off" : "record_on") :
                    "camera"
@@ -869,7 +875,7 @@
             }
 
             enabled: !camera.switchInProgress && camera.videoRecorder.recorderState == CameraRecorder.StoppedState
-                     && !camera.photoCaptureInProgress
+                     && !camera.photoCaptureInProgress && !camera.timedCaptureInProgress
             iconName: "camera-flip"
             onClicked: controls.switchCamera()
         }
@@ -892,7 +898,7 @@
             property real maximumScale: 3.0
             property bool active: false
 
-            enabled: !camera.photoCaptureInProgress
+            enabled: !camera.photoCaptureInProgress && !camera.timedCaptureInProgress
             onPinchStarted: {
                 active = true;
                 initialZoom = zoomControl.value;
@@ -910,6 +916,7 @@
 
             MouseArea {
                 id: manualFocusMouseArea
+                objectName: "manualFocusMouseArea"
                 anchors {
                     fill: parent
                     // Pinch gestures need more clearance at the edges of the screen, but
@@ -918,7 +925,7 @@
                     rightMargin: -bottomEdgeIndicators.height
                 }
                 enabled: camera.focus.isFocusPointModeSupported(Camera.FocusPointCustom) &&
-                         !camera.photoCaptureInProgress
+                         !camera.photoCaptureInProgress && !camera.timedCaptureInProgress
                 onClicked: {
                     camera.manualFocus(mouse.x, mouse.y);
                     mouse.accepted = false;

=== modified file 'ViewFinderOverlayLoader.qml'
--- ViewFinderOverlayLoader.qml	2016-02-23 11:46:52 +0000
+++ ViewFinderOverlayLoader.qml	2016-03-23 15:42:41 +0000
@@ -25,6 +25,7 @@
     property var controls: loader.item ? loader.item.controls : null
     property var settings: loader.item.settings
     property bool readyForCapture
+    property int sensorOrientation
 
     function showFocusRing(x, y) {
         loader.item.showFocusRing(x, y);
@@ -37,7 +38,8 @@
     asynchronous: true
     Component.onCompleted: {
         loader.setSource("ViewFinderOverlay.qml", { "camera": loader.camera,
-                                                    "readyForCapture": Qt.binding(function() { return loader.readyForCapture})
+                                                    "readyForCapture": Qt.binding(function() { return loader.readyForCapture}),
+                                                    "sensorOrientation": Qt.binding(function () {return loader.sensorOrientation})
                                                   });
     }
 }

=== modified file 'ViewFinderView.qml'
--- ViewFinderView.qml	2016-02-23 11:46:52 +0000
+++ ViewFinderView.qml	2016-03-23 15:42:41 +0000
@@ -21,9 +21,9 @@
 import QtMultimedia 5.0
 import CameraApp 0.1
 import QtGraphicalEffects 1.0
-import Ubuntu.Content 0.1
+import Ubuntu.Content 1.3
 
-Item {
+FocusScope {
     id: viewFinderView
 
     property bool overlayVisible: true
@@ -60,11 +60,15 @@
         property bool failedToConnect: false
 
         function manualFocus(x, y) {
-            viewFinderOverlay.showFocusRing(x, y);
-            autoFocusTimer.restart();
-            focus.focusMode = Camera.FocusAuto;
-            focus.customFocusPoint = viewFinder.mapPointToSourceNormalized(Qt.point(x, y));
-            focus.focusPointMode = Camera.FocusPointCustom;
+            var normalizedPoint = viewFinder.mapPointToSourceNormalized(Qt.point(x, y - viewFinder.y));
+            if (normalizedPoint.x >= 0.0 && normalizedPoint.x <= 1.0 &&
+                normalizedPoint.y >= 0.0 && normalizedPoint.y <= 1.0) {
+                viewFinderOverlay.showFocusRing(x, y);
+                autoFocusTimer.restart();
+                focus.focusMode = Camera.FocusAuto;
+                focus.customFocusPoint = normalizedPoint;
+                focus.focusPointMode = Camera.FocusPointCustom;
+            }
         }
 
         function autoFocus() {
@@ -96,6 +100,7 @@
         property alias maximumZoom: camera.maximumDigitalZoom
         property bool switchInProgress: false
         property bool photoCaptureInProgress: false
+        property bool timedCaptureInProgress: false
 
         onPhotoCaptureInProgressChanged: {
             if (main.contentExportMode && camera.photoCaptureInProgress) {
@@ -110,14 +115,6 @@
                         if (photoRollHint.necessary && !main.transfer) photoRollHint.enable();
                         camera.photoCaptureInProgress = false;
                     }
-
-                    if (main.transfer) {
-                        if (main.transfer.contentType === ContentType.Videos) {
-                            viewFinderView.captureMode = Camera.CaptureVideo;
-                        } else {
-                            viewFinderView.captureMode = Camera.CaptureStillImage;
-                        }
-                    }
                 }
             }
 
@@ -265,6 +262,7 @@
                 // Set orientation only at startup because later on Screen.primaryOrientation
                 // may change.
                 orientation = Screen.primaryOrientation === Qt.PortraitOrientation  ? -90 : 0;
+                viewFinderOverlay.sensorOrientation = orientation;
             }
 
             transform: Rotation {
@@ -421,6 +419,7 @@
 
     PhotoRollHint {
         id: photoRollHint
+        objectName: "photoRollHint"
         anchors.fill: parent
         visible: enabled
 

=== modified file 'camera-app.qml'
--- camera-app.qml	2016-02-23 11:46:52 +0000
+++ camera-app.qml	2016-03-23 15:42:41 +0000
@@ -20,7 +20,7 @@
 import Ubuntu.Components 1.3
 import Ubuntu.Unity.Action 1.1 as UnityActions
 import UserMetrics 0.1
-import Ubuntu.Content 0.1
+import Ubuntu.Content 1.3
 import CameraApp 0.1
 
 Window {
@@ -30,6 +30,26 @@
     height: units.gu(80)
     color: "black"
     title: "Camera"
+    // special flag only supported by Unity8/MIR so far that hides the shell's
+    // top panel in Staged mode
+    flags: Qt.Window | 0x00800000
+
+    property int preFullScreenVisibility
+
+    function toggleFullScreen() {
+        if (main.visibility != Window.FullScreen) {
+            preFullScreenVisibility = main.visibility;
+            main.visibility = Window.FullScreen;
+        } else {
+            main.visibility = preFullScreenVisibility;
+        }
+    }
+
+    function exitFullScreen() {
+        if (main.visibility == Window.FullScreen) {
+            main.visibility = preFullScreenVisibility;
+        }
+    }
 
     UnityActions.ActionManager {
         actions: [
@@ -63,11 +83,7 @@
 
     Component.onCompleted: {
         i18n.domain = "camera-app";
-        if (!application.desktopMode) {
-            main.showFullScreen();
-        } else {
-            main.show();
-        }
+        main.show();
     }
 
 
@@ -78,6 +94,15 @@
         flickableDirection: state == "PORTRAIT" ? Flickable.HorizontalFlick : Flickable.VerticalFlick
         boundsBehavior: Flickable.StopAtBounds
 
+        Keys.onPressed: {
+            if (event.key == Qt.Key_F11) {
+                main.toggleFullScreen();
+                event.accepted = true;
+            }
+        }
+        Keys.onEscapePressed: main.exitFullScreen()
+
+
         property real panesMargin: units.gu(1)
         property real ratio
         property int orientationAngle: Screen.angleBetween(Screen.primaryOrientation, Screen.orientation)
@@ -135,7 +160,9 @@
                 }
             }
         ]
-        interactive: !viewFinderView.touchAcquired && !galleryView.touchAcquired && !viewFinderView.camera.photoCaptureInProgress
+        interactive: !viewFinderView.touchAcquired && !galleryView.touchAcquired
+                     && !viewFinderView.camera.photoCaptureInProgress
+                     && !viewFinderView.camera.timedCaptureInProgress
 
         Component.onCompleted: {
             // FIXME: workaround for qtubuntu not returning values depending on the grid unit definition
@@ -256,6 +283,7 @@
             height: viewSwitcher.height
             overlayVisible: !viewSwitcher.moving && !viewSwitcher.flicking
             inView: viewSwitcher.ratio < 0.5
+            focus: !galleryView.focus
             opacity: inView ? 1.0 : 0.0
             onPhotoTaken: {
                 galleryView.prependMediaToModel(filePath);
@@ -273,6 +301,7 @@
             width: viewSwitcher.width
             height: viewSwitcher.height
             inView: viewSwitcher.ratio > 0.0
+            focus: inView
             onExit: viewSwitcher.switchToViewFinder()
             opacity: inView ? 1.0 : 0.0
         }
@@ -280,7 +309,7 @@
 
     property bool contentExportMode: transfer !== null
     property var transfer: null
-    property var transferContentType: ContentType.Pictures
+    property var transferContentType: transfer ? transfer.contentType : "image"
 
     function exportContent(urls) {
         if (!main.transfer) return;
@@ -312,16 +341,10 @@
         onExportRequested: {
             viewSwitcher.switchToViewFinder();
 
-            // The exportRequested event can arrive before or after the
-            // app is active, but setting the recording type before the
-            // capture becomes ready does not have any effect.
-            // See camera.imageCapture.onReadyChanged for the other case.
-            if (viewFinderView.camera.imageCapture.ready) {
-                if (transfer.contentType === ContentType.Videos) {
-                    viewFinderView.captureMode = Camera.CaptureVideo;
-                } else {
-                    viewFinderView.captureMode = Camera.CaptureStillImage;
-                }
+            if (transfer.contentType === ContentType.Videos) {
+                viewFinderView.captureMode = Camera.CaptureVideo;
+            } else {
+                viewFinderView.captureMode = Camera.CaptureStillImage;
             }
             main.transfer = transfer;
         }

=== modified file 'debian/control'
--- debian/control	2015-07-31 02:23:54 +0000
+++ debian/control	2016-03-23 15:42:41 +0000
@@ -13,11 +13,14 @@
                qtbase5-dev,
                qtdeclarative5-dev,
                qml-module-qtquick2,
+               qml-module-qtpositioning,
                qml-module-qttest,
                qtdeclarative5-ubuntu-ui-toolkit-plugin,
                qtdeclarative5-unity-action-plugin (>= 1.1.0),
                qtdeclarative5-usermetrics0.1,
                qtdeclarative5-ubuntu-content1,
+               qtdeclarative5-ubuntu-thumbnailer0.1,
+               qtdeclarative5-ubuntu-ui-extras0.2,
                qtmultimedia5-dev,
                libusermetricsinput1-dev,
                gettext,

=== modified file 'tests/autopilot/camera_app/emulators/main_window.py'
--- tests/autopilot/camera_app/emulators/main_window.py	2015-11-25 17:00:31 +0000
+++ tests/autopilot/camera_app/emulators/main_window.py	2016-03-23 15:42:41 +0000
@@ -36,10 +36,29 @@
         """Returns the gallery view"""
         return self.app.wait_select_single("GalleryView")
 
+    def get_media(self, index=0):
+        """Returns media at index in the currently loaded view in gallery"""
+        gallery = self.get_gallery()
+        view = gallery.select_single("SlideshowView")
+        if not view.visible:
+            view = gallery.select_single("PhotogridView")
+
+        return view.wait_select_single(objectName="mediaItem" + str(index))
+
+    def get_broken_media_icon(self, index=0):
+        """Returns the broken media icon"""
+        media = self.get_media(index)
+        return media.wait_select_single(objectName="thumbnailLoadingErrorIcon")
+
     def get_no_media_hint(self):
         """Returns the Item representing the hint that no media is available"""
         return self.app.wait_select_single(objectName="noMediaHint")
 
+    def get_focus_mouse_area(self):
+        """Returns the focus mouse area"""
+        return self.app.wait_select_single("QQuickMouseArea",
+                                           objectName="manualFocusMouseArea")
+
     def get_focus_ring(self):
         """Returns the focus ring of the camera"""
         return self.app.wait_select_single("FocusRing")
@@ -49,9 +68,9 @@
         return self.app.wait_select_single("ShootButton")
 
     def get_photo_roll_hint(self):
-        """Returns the layer that serves at hinting to the existence of the
-        photo roll"""
-        return self.app.wait_select_single("PhotoRollHint")
+        """Returns the photo roll hint"""
+        return self.app.wait_select_single("PhotoRollHint",
+                                           objectName="photoRollHint")
 
     def get_record_control(self):
         """Returns the button that toggles between photo and video recording"""
@@ -63,8 +82,12 @@
            in settingsProperty
         """
         optionButtons = self.app.select_many("OptionButton")
-        return next(button for button in optionButtons
-                    if button.settingsProperty == settingsProperty)
+        optionButton = next(button for button in optionButtons
+                            if button.settingsProperty == settingsProperty)
+        if optionButton.visible:
+            return optionButton
+        else:
+            return None
 
     def get_flash_button(self):
         """Returns the flash control button of the camera"""
@@ -90,6 +113,10 @@
         """Returns the video resolution button of the camera"""
         return self.get_option_button("videoResolution")
 
+    def get_timer_delay_button(self):
+        """Returns the timer delay option button of the camera"""
+        return self.get_option_button("selfTimerDelay")
+
     def get_stop_watch(self):
         """Returns the stop watch when using the record button of the camera"""
         return self.app.wait_select_single("StopWatch")
@@ -139,30 +166,71 @@
         except:
             return None
 
+    def open_actions_drawer(self, gallery):
+        """Opens action drawer of gallery"""
+        actionsDrawerButton = gallery.wait_select_single(
+            "IconButton",
+            objectName="additionalActionsButton")
+        self.app.pointing_device.move_to_object(actionsDrawerButton)
+        self.app.pointing_device.click()
+        actionsDrawer = gallery.wait_select_single("QQuickItem",
+                                                   objectName="actionsDrawer")
+        actionsDrawer.fullyOpened.wait_for(True)
+
+    def close_actions_drawer(self, gallery):
+        """Closes action drawer of gallery"""
+        actionsDrawerButton = gallery.wait_select_single(
+            "IconButton",
+            objectName="additionalActionsButton")
+        self.app.pointing_device.move_to_object(actionsDrawerButton)
+        self.app.pointing_device.click()
+        actionsDrawer = gallery.wait_select_single("QQuickItem",
+                                                   objectName="actionsDrawer")
+        actionsDrawer.fullyClosed.wait_for(True)
+
     def swipe_to_gallery(self, testCase):
         view_switcher = self.get_view_switcher()
+        viewfinder = self.get_viewfinder()
+        view_switcher.interactive.wait_for(True)
+        view_switcher.enabled.wait_for(True)
+        view_switcher.settling.wait_for(False)
+        view_switcher.switching.wait_for(False)
+        viewfinder.inView.wait_for(True)
         x, y = view_switcher.x, view_switcher.y
         w, h = view_switcher.width, view_switcher.height
 
         tx = x + (w // 2)
         ty = y + (h // 2)
 
-        self.app.pointing_device.drag(tx, ty, x, ty, rate=1)
-        viewfinder = self.get_viewfinder()
+        # FIXME: a rate higher than 1 does not always make view_switcher move
+        self.app.pointing_device.drag(tx, ty, x, ty, rate=1,
+                                      time_between_events=0.0001)
+
         testCase.assertThat(viewfinder.inView, Eventually(Equals(False)))
+        view_switcher.settling.wait_for(False)
+        view_switcher.switching.wait_for(False)
 
     def swipe_to_viewfinder(self, testCase):
         view_switcher = self.get_view_switcher()
+        viewfinder = self.get_viewfinder()
+        view_switcher.interactive.wait_for(True)
+        view_switcher.enabled.wait_for(True)
+        view_switcher.settling.wait_for(False)
+        view_switcher.switching.wait_for(False)
+        viewfinder.inView.wait_for(False)
         x, y = view_switcher.x, view_switcher.y
         w, h = view_switcher.width, view_switcher.height
 
         tx = x + (w // 2)
         ty = y + (h // 2)
 
+        # FIXME: a rate higher than 1 does not always make view_switcher move
         self.app.pointing_device.drag(
-            tx, ty, (tx + view_switcher.width // 2), ty, rate=1)
-        viewfinder = self.get_viewfinder()
+            tx, ty, (tx + view_switcher.width // 2), ty, rate=1,
+            time_between_events=0.0001)
         testCase.assertThat(viewfinder.inView, Eventually(Equals(True)))
+        view_switcher.settling.wait_for(False)
+        view_switcher.switching.wait_for(False)
 
     def switch_cameras(self):
         # Swap cameras and wait for camera to settle

=== modified file 'tests/autopilot/camera_app/emulators/panel.py'
--- tests/autopilot/camera_app/emulators/panel.py	2015-12-01 09:03:34 +0000
+++ tests/autopilot/camera_app/emulators/panel.py	2016-03-23 15:42:41 +0000
@@ -24,6 +24,7 @@
         :return: The panel.
 
         """
+        self.ready.wait_for(True)
         self.animating.wait_for(False)
         if not self.opened:
             self._drag_to_open()
@@ -38,11 +39,14 @@
         start_y = y + self.height - 1
         stop_y = y
 
-        self.pointing_device.drag(line_x, start_y, line_x, stop_y)
+        # FIXME: a rate higher than 1 does not always make panel move
+        self.pointing_device.drag(line_x, start_y, line_x, stop_y, rate=1,
+                                  time_between_events=0.0001)
 
     @autopilot_logging.log_action(logger.info)
     def close(self):
         """Close the panel if it's opened."""
+        self.ready.wait_for(True)
         self.animating.wait_for(False)
         if self.opened:
             self._drag_to_close()
@@ -55,4 +59,6 @@
         start_y = y
         stop_y = y + self.height - 1
 
-        self.pointing_device.drag(line_x, start_y, line_x, stop_y)
+        # FIXME: a rate higher than 1 does not always make panel move
+        self.pointing_device.drag(line_x, start_y, line_x, stop_y, rate=1,
+                                  time_between_events=0.0001)

=== modified file 'tests/autopilot/camera_app/tests/__init__.py'
--- tests/autopilot/camera_app/tests/__init__.py	2015-05-15 07:29:16 +0000
+++ tests/autopilot/camera_app/tests/__init__.py	2016-03-23 15:42:41 +0000
@@ -8,7 +8,6 @@
 """Camera-app autopilot tests."""
 
 import os
-import time
 import shutil
 from pkg_resources import resource_filename
 
@@ -42,6 +41,12 @@
     sample_dir = resource_filename('camera_app', 'data')
 
     def setUp(self):
+        # Remove configuration file
+        config_file = os.path.expanduser(
+            "~/.config/com.ubuntu.camera/com.ubuntu.camera.conf")
+        if os.path.exists(config_file):
+            os.remove(config_file)
+
         self.pointing_device = Pointer(self.input_device_class.create())
         super(CameraAppTestCase, self).setUp()
         if os.path.exists(self.local_location):
@@ -51,11 +56,7 @@
         else:
             self.launch_click_installed()
 
-        #  wait and sleep as workaround for bug #1373039. To
-        #  make sure large components get loaded asynchronously on start-up
-        #  -- Chris Gagnon 11-17-2014
         self.main_window.get_qml_view().visible.wait_for(True)
-        time.sleep(5)
 
     def launch_test_local(self):
         self.app = self.launch_test_application(
@@ -107,6 +108,11 @@
         shutil.copyfile(os.path.join(self.sample_dir, "sample.jpg"),
                         os.path.join(self.pictures_dir, "sample.jpg"))
 
-    def add_sample_video(self):
-        shutil.copyfile(os.path.join(self.sample_dir, "sample.mp4"),
-                        os.path.join(self.videos_dir, "sample.mp4"))
+    def add_sample_video(self, broken=False):
+        if broken:
+            path = os.path.join(self.videos_dir, "sample_broken.mp4")
+            with open(path, "w") as video:
+                video.write("I AM NOT A VIDEO")
+        else:
+            shutil.copyfile(os.path.join(self.sample_dir, "sample.mp4"),
+                            os.path.join(self.videos_dir, "sample.mp4"))

=== modified file 'tests/autopilot/camera_app/tests/test_capture.py'
--- tests/autopilot/camera_app/tests/test_capture.py	2015-12-01 09:03:34 +0000
+++ tests/autopilot/camera_app/tests/test_capture.py	2016-03-23 15:42:41 +0000
@@ -17,6 +17,7 @@
 import unittest
 import time
 import os
+import glob
 
 
 class TestCapture(CameraAppTestCase):
@@ -25,23 +26,10 @@
     """ This is needed to wait for the application to start.
         In the testfarm, the application may take some time to show up."""
     def setUp(self):
-        # Remove configuration file where knowledge of the photo roll hint's
-        # necessity is stored
-        config_file = os.path.expanduser(
-            "~/.config/com.ubuntu.camera/com.ubuntu.camera.conf")
-        if os.path.exists(config_file):
-            os.remove(config_file)
-
         super(TestCapture, self).setUp()
-
-        self.assertThat(
-            self.main_window.get_qml_view().visible, Eventually(Equals(True)))
         self.pictures_dir = os.path.expanduser("~/Pictures/com.ubuntu.camera")
         self.videos_dir = os.path.expanduser("~/Videos/com.ubuntu.camera")
 
-    def tearDown(self):
-        super(TestCapture, self).tearDown()
-
     """Test taking a picture"""
     def test_take_picture(self):
         exposure_button = self.main_window.get_exposure_button()
@@ -83,6 +71,62 @@
         # check that the camera is able to capture another photo
         self.assertThat(exposure_button.enabled, Eventually(Equals(True)))
 
+    """Test taking a picture with a timer set"""
+    def test_take_picture_with_timer(self):
+        delay = 5
+        self.enable_timer("%s seconds" % str(delay))
+
+        # start timed shoot
+        shoot_button = self.main_window.get_exposure_button()
+        self.assertThat(shoot_button.enabled, Eventually(Equals(True)))
+        self.pointing_device.move_to_object(shoot_button)
+        self.pointing_device.click()
+
+        switch_cameras_button = self.main_window.get_swap_camera_button()
+        record_mode_button = self.main_window.get_record_control()
+        view_switcher = self.main_window.get_view_switcher()
+
+        # controls and navigation should be disabled at this point
+        self.assertThat(shoot_button.enabled,
+                        Eventually(Equals(True)))
+        self.assertThat(switch_cameras_button.enabled,
+                        Eventually(Equals(True)))
+        self.assertThat(record_mode_button.enabled,
+                        Eventually(Equals(True)))
+        self.assertThat(view_switcher.interactive,
+                        Eventually(Equals(True)))
+
+        # after the delay controls and navigation should be re-enabled
+        self.assertThat(shoot_button.enabled,
+                        Eventually(Equals(True), timeout=delay))
+        self.assertThat(switch_cameras_button.enabled,
+                        Eventually(Equals(True), timeout=delay))
+        self.assertThat(record_mode_button.enabled,
+                        Eventually(Equals(True), timeout=delay))
+        self.assertThat(view_switcher.interactive,
+                        Eventually(Equals(True), timeout=delay))
+
+    def enable_timer(self, label_value):
+        # open bottom edge
+        bottom_edge = self.main_window.get_bottom_edge()
+        bottom_edge.open()
+
+        # open video resolution option value selector showing the possible
+        # values
+        timer_delay_button = self.main_window.get_timer_delay_button()
+        self.pointing_device.move_to_object(timer_delay_button)
+        self.pointing_device.click()
+        option_value_selector = self.main_window.get_option_value_selector()
+        self.assertThat(
+            option_value_selector.visible, Eventually(Equals(True)))
+
+        # select a 5 seconds delay
+        option = self.main_window.get_option_value_button(label_value)
+        self.pointing_device.move_to_object(option)
+        self.pointing_device.click()
+
+        bottom_edge.close()
+
     def test_record_video(self):
         """Test clicking on the record control.
 
@@ -208,7 +252,7 @@
     def get_first_picture(self, timeout=10):
         pictures = []
         for i in range(0, timeout):
-            pictures = os.listdir(self.pictures_dir)
+            pictures = glob.glob(os.path.join(self.pictures_dir, "*.jpg"))
             if len(pictures) != 0:
                 break
             time.sleep(1)
@@ -236,9 +280,11 @@
         return quality
 
     def dismiss_first_photo_hint(self):
-        # Swipe to photo roll and back to viewfinder
-        self.main_window.swipe_to_gallery(self)
-        self.main_window.swipe_to_viewfinder(self)
+        photo_roll_hint = self.main_window.get_photo_roll_hint()
+        if photo_roll_hint.enabled:
+            # Swipe to photo roll and back to viewfinder
+            self.main_window.swipe_to_gallery(self)
+            self.main_window.swipe_to_viewfinder(self)
 
     def set_compression_quality(self, quality="Normal Quality"):
         # open bottom edge
@@ -276,9 +322,10 @@
         # switch cameras and select the last resolution for the current camera
         self.main_window.switch_cameras()
         resolutions = self.get_available_video_resolutions()
-        expected_resolution = resolutions[-1]
-        self.assertThat(expected_resolution, NotEquals(initial_resolution))
-        self.set_video_resolution(expected_resolution)
+        if len(resolutions) > 1:
+            expected_resolution = resolutions[-1]
+            self.assertThat(expected_resolution, NotEquals(initial_resolution))
+            self.set_video_resolution(expected_resolution)
 
         # switch back to the initial camera and record a video
         self.main_window.switch_cameras()

=== modified file 'tests/autopilot/camera_app/tests/test_diskspace.py'
--- tests/autopilot/camera_app/tests/test_diskspace.py	2015-04-29 15:56:44 +0000
+++ tests/autopilot/camera_app/tests/test_diskspace.py	2016-03-23 15:42:41 +0000
@@ -61,9 +61,6 @@
         # threshold as they all expect a normal situation at the start
         self.assertThat(self.diskSpaceAvailable(), GreaterThan(LOW_THRESHOLD))
 
-        self.assertThat(
-            self.main_window.get_qml_view().visible, Eventually(Equals(True)))
-
     def tearDown(self):
         super(TestCameraDiskSpace, self).tearDown()
         os.remove(self.diskFiller) if os.path.exists(self.diskFiller) else None
@@ -75,8 +72,8 @@
         exposure_button = self.main_window.get_exposure_button()
         no_space_hint = self.main_window.get_no_space_hint()
 
-        self.assertThat(exposure_button.enabled, Equals(True))
-        self.assertThat(no_space_hint.visible, Equals(False))
+        self.assertThat(exposure_button.enabled, Eventually(Equals(True)))
+        self.assertThat(no_space_hint.visible, Eventually(Equals(False)))
 
         self.setFreeSpaceTo(CRITICAL_THRESHOLD - MEGABYTE)
         self.assertThat(
@@ -89,8 +86,8 @@
         self.assertThat(
             self.diskSpaceAvailable(), GreaterThan(CRITICAL_THRESHOLD))
 
-        self.assertThat(exposure_button.enabled, Equals(True))
-        self.assertThat(no_space_hint.visible, Equals(False))
+        self.assertThat(exposure_button.enabled, Eventually(Equals(True)))
+        self.assertThat(no_space_hint.visible, Eventually(Equals(False)))
 
     def test_low_disk(self):
         """Verify proper behavior when disk space becomes low"""

=== modified file 'tests/autopilot/camera_app/tests/test_flash.py'
--- tests/autopilot/camera_app/tests/test_flash.py	2015-07-03 13:27:48 +0000
+++ tests/autopilot/camera_app/tests/test_flash.py	2016-03-23 15:42:41 +0000
@@ -16,21 +16,14 @@
 class TestCameraFlash(CameraAppTestCase):
     """Tests the flash"""
 
-    """ This is needed to wait for the application to start.
-        In the testfarm, the application may take some time to show up."""
-    def setUp(self):
-        super(TestCameraFlash, self).setUp()
-        self.assertThat(
-            self.main_window.get_qml_view().visible, Eventually(Equals(True)))
-
-    def tearDown(self):
-        super(TestCameraFlash, self).tearDown()
-
     """Test that flash modes activate properly"""
     def test_cycle_flash(self):
         bottom_edge = self.main_window.get_bottom_edge()
         bottom_edge.open()
         flash_button = self.main_window.get_flash_button()
+        if not flash_button:
+            return
+
         option_value_selector = self.main_window.get_option_value_selector()
 
         # open option value selector showing the possible values
@@ -67,10 +60,13 @@
         bottom_edge = self.main_window.get_bottom_edge()
         bottom_edge.open()
         flash_button = self.main_window.get_video_flash_button()
+        if not flash_button:
+            return
+
         option_value_selector = self.main_window.get_option_value_selector()
 
         # ensure initial state
-        self.assertThat(flash_button.iconName, Equals("torch-off"))
+        self.assertThat(flash_button.iconName, Eventually(Equals("torch-off")))
 
         # open option value selector showing the possible values
         self.pointing_device.move_to_object(flash_button)
@@ -83,19 +79,22 @@
         option = self.main_window.get_option_value_button("On")
         self.pointing_device.move_to_object(option)
         self.pointing_device.click()
-        self.assertThat(flash_button.iconName, Equals("torch-on"))
+        self.assertThat(flash_button.iconName, Eventually(Equals("torch-on")))
 
         # set flash to "off"
         option = self.main_window.get_option_value_button("Off")
         self.pointing_device.move_to_object(option)
         self.pointing_device.click()
-        self.assertThat(flash_button.iconName, Equals("torch-off"))
+        self.assertThat(flash_button.iconName, Eventually(Equals("torch-off")))
 
     """Test that flash and hdr modes are mutually exclusive"""
     def test_flash_hdr_mutually_exclusive(self):
         bottom_edge = self.main_window.get_bottom_edge()
         bottom_edge.open()
         flash_button = self.main_window.get_flash_button()
+        if not flash_button:
+            return
+
         hdr_button = self.main_window.get_hdr_button()
         option_value_selector = self.main_window.get_option_value_selector()
 

=== modified file 'tests/autopilot/camera_app/tests/test_focus.py'
--- tests/autopilot/camera_app/tests/test_focus.py	2016-02-26 08:52:37 +0000
+++ tests/autopilot/camera_app/tests/test_focus.py	2016-03-23 15:42:41 +0000
@@ -18,26 +18,19 @@
 class TestFocus(CameraAppTestCase):
     """Tests the focus"""
 
-    """ This is needed to wait for the application to start.
-        In the testfarm, the application may take some time to show up."""
-    def setUp(self):
-        super(TestFocus, self).setUp()
-        self.assertThat(
-            self.main_window.get_qml_view().visible, Eventually(Equals(True)))
-
-    def tearDown(self):
-        super(TestFocus, self).tearDown()
-
     def verify_focus_ring_after_click_at(self, ring, x, y):
         # The focus ring should be invisible in the beginning
         self.assertThat(ring.opacity, Eventually(Equals(0.0)))
 
+        focus_mouse_area = self.main_window.get_focus_mouse_area()
+        self.assertThat(focus_mouse_area.enabled, Eventually(Equals(True)))
+
         # Click in the designated spot
         self.pointing_device.move(x, y)
         self.pointing_device.click()
 
         # The focus ring sould be visible now
-        self.assertThat(ring.opacity, Eventually(GreaterThan(0.5)))
+        self.assertThat(ring.opacity, Eventually(GreaterThan(0.1)))
 
         # After some seconds the focus ring should fade out
         self.assertThat(ring.opacity, Eventually(Equals(0.0)))
@@ -45,19 +38,22 @@
     """Test focusing in an area where we know the picture is"""
     @unittest.skipIf(model() == 'Galaxy Nexus', 'Unusable with Mir on maguro')
     def test_focus_valid_and_disappear(self):
+        geometry = self.main_window.get_viewfinder_geometry()
         focus_ring = self.main_window.get_focus_ring()
-        feed = self.main_window.get_viewfinder_geometry()
         switch_cameras = self.main_window.get_swap_camera_button()
         exposure_button = self.main_window.get_exposure_button()
 
         # Click in the center of the viewfinder area
-        mid_x, mid_y = self.get_center(feed)
+        mid_x, mid_y = self.get_center(geometry)
         self.verify_focus_ring_after_click_at(focus_ring, mid_x, mid_y)
 
         # Then try on the side edges and top edge to verify they
         # are focusable too
-        self.verify_focus_ring_after_click_at(focus_ring, 1, mid_y)
-        self.verify_focus_ring_after_click_at(focus_ring, feed.width - 1,
+        self.verify_focus_ring_after_click_at(focus_ring,
+                                              geometry.globalRect.x + 1, mid_y)
+        self.verify_focus_ring_after_click_at(focus_ring,
+                                              geometry.globalRect.x +
+                                              geometry.globalRect.width - 1,
                                               mid_y)
         self.verify_focus_ring_after_click_at(focus_ring, mid_x, 1)
 
@@ -69,10 +65,13 @@
         # Click in the center of the viewfinder area
         self.verify_focus_ring_after_click_at(focus_ring, mid_x, mid_y)
 
-        # Then try on the side edges and top edge to verify they
+        # Then try on the left, right and above the center to verify they
         # are focusable too
-        self.verify_focus_ring_after_click_at(focus_ring, 1, mid_y)
-        self.verify_focus_ring_after_click_at(focus_ring, feed.width - 1,
+        self.verify_focus_ring_after_click_at(focus_ring,
+                                              geometry.globalRect.x + 1, mid_y)
+        self.verify_focus_ring_after_click_at(focus_ring,
+                                              geometry.globalRect.x +
+                                              geometry.globalRect.width - 1,
                                               mid_y)
         self.verify_focus_ring_after_click_at(focus_ring, mid_x, 1)
 

=== modified file 'tests/autopilot/camera_app/tests/test_gallery_view.py'
--- tests/autopilot/camera_app/tests/test_gallery_view.py	2015-04-29 15:56:44 +0000
+++ tests/autopilot/camera_app/tests/test_gallery_view.py	2016-03-23 15:42:41 +0000
@@ -7,7 +7,7 @@
 
 """Tests for the Camera App zoom"""
 
-from testtools.matchers import Equals
+from testtools.matchers import Equals, NotEquals
 from autopilot.matchers import Eventually
 
 from camera_app.tests import CameraAppTestCase
@@ -35,16 +35,19 @@
         self.assertThat(slideshow_view.visible, Eventually(Equals(False)))
         self.assertThat(photogrid_view.visible, Eventually(Equals(True)))
 
-    def select_first_photo(self):
-        # select the first photo
-        gallery = self.main_window.get_gallery()
-        photo = gallery.wait_select_single(objectName="mediaItem0")
-        self.pointing_device.move_to_object(photo)
-
-        # do a long press to enter Multiselection mode
-        self.pointing_device.press()
-        sleep(1)
-        self.pointing_device.release()
+    def select_media(self, index=0):
+        media = self.main_window.get_media(index)
+        checkbox = media.wait_select_single(objectName="mediaItemCheckBox")
+
+        self.pointing_device.move_to_object(checkbox)
+
+        if checkbox.visible:
+            self.click()
+        else:
+            # do a long press to enter Multiselection mode
+            self.pointing_device.press()
+            sleep(1)
+            self.pointing_device.release()
 
 
 class TestCameraGalleryView(CameraAppTestCase, TestCameraGalleryViewMixin):
@@ -53,11 +56,6 @@
     def setUp(self):
         self.delete_all_media()
         super(TestCameraGalleryView, self).setUp()
-        self.assertThat(
-            self.main_window.get_qml_view().visible, Eventually(Equals(True)))
-
-    def tearDown(self):
-        super(TestCameraGalleryView, self).tearDown()
 
     """Tests swiping to the gallery and pressing the back button"""
     def test_swipe_to_gallery(self):
@@ -112,26 +110,55 @@
     def setUp(self):
         self.delete_all_media()
         self.add_sample_video()
-
         super(TestCameraGalleryViewWithVideo, self).setUp()
-        self.assertThat(
-            self.main_window.get_qml_view().visible, Eventually(Equals(True)))
-
-    def tearDown(self):
-        super(TestCameraGalleryViewWithVideo, self).tearDown()
 
     """Tests the thumnails for video load correctly in slideshow view"""
     def test_video_thumbnails(self):
         viewfinder = self.main_window.get_viewfinder()
         gallery = self.main_window.get_gallery()
-
-        self.main_window.swipe_to_gallery(self)
-
-        self.assertThat(viewfinder.inView, Eventually(Equals(False)))
-        self.assertThat(gallery.inView, Eventually(Equals(True)))
-
-        spinner = gallery.wait_select_single("ActivityIndicator")
-        self.assertThat(spinner.running, Eventually(Equals(False)))
+        self.main_window.swipe_to_gallery(self)
+
+        self.assertThat(viewfinder.inView, Eventually(Equals(False)))
+        self.assertThat(gallery.inView, Eventually(Equals(True)))
+
+        spinner = gallery.wait_select_single("ActivityIndicator")
+        self.assertThat(spinner.running, Eventually(Equals(False)))
+
+        thumb_error = self.main_window.get_broken_media_icon()
+        self.assertThat(thumb_error.opacity, Eventually(Equals(0.0)))
+
+        self.move_from_slideshow_to_photogrid()
+        thumb_error = self.main_window.get_broken_media_icon()
+        self.assertThat(thumb_error.opacity, Eventually(Equals(0.0)))
+
+
+class TestCameraGalleryViewWithBrokenVideo(
+        TestCameraGalleryViewMixin, CameraAppTestCase):
+    """Tests the camera gallery view with a broken video already present"""
+
+    def setUp(self):
+        self.delete_all_media()
+        self.add_sample_video(broken=True)
+        super(TestCameraGalleryViewWithBrokenVideo, self).setUp()
+
+    """Tests the placeholder thumnails for broken video loads correctly"""
+    def test_video_thumbnails(self):
+        viewfinder = self.main_window.get_viewfinder()
+        gallery = self.main_window.get_gallery()
+
+        self.main_window.swipe_to_gallery(self)
+        self.assertThat(viewfinder.inView, Eventually(Equals(False)))
+        self.assertThat(gallery.inView, Eventually(Equals(True)))
+
+        spinner = gallery.wait_select_single("ActivityIndicator")
+        self.assertThat(spinner.running, Eventually(Equals(False)))
+
+        thumb_error = self.main_window.get_broken_media_icon()
+        self.assertThat(thumb_error.opacity, Eventually(NotEquals(0.0)))
+
+        self.move_from_slideshow_to_photogrid()
+        thumb_error = self.main_window.get_broken_media_icon()
+        self.assertThat(thumb_error.opacity, Eventually(NotEquals(0.0)))
 
 
 class TestCameraGalleryViewWithPhoto(
@@ -141,25 +168,17 @@
     def setUp(self):
         self.delete_all_media()
         self.add_sample_photo()
-
         super(TestCameraGalleryViewWithPhoto, self).setUp()
-        self.assertThat(
-            self.main_window.get_qml_view().visible, Eventually(Equals(True)))
-
-    def tearDown(self):
-        super(TestCameraGalleryViewWithPhoto, self).tearDown()
 
     """Test deleting photo from multiselection"""
     def test_delete_photo_from_multiselection(self):
         self.main_window.swipe_to_gallery(self)
         self.move_from_slideshow_to_photogrid()
-        self.select_first_photo()
+        self.select_media()
 
         # open actions drawer
         gallery = self.main_window.get_gallery()
-        opt = gallery.wait_select_single(objectName="additionalActionsButton")
-        self.pointing_device.move_to_object(opt)
-        self.pointing_device.click()
+        self.main_window.open_actions_drawer(gallery)
 
         # click delete action button
         delete = gallery.wait_select_single(objectName="actionButtonDelete")
@@ -178,7 +197,7 @@
     def test_multiselection_mode(self):
         self.main_window.swipe_to_gallery(self)
         self.move_from_slideshow_to_photogrid()
-        self.select_first_photo()
+        self.select_media()
 
         # exit the multiselection mode
         gallery = self.main_window.get_gallery()
@@ -191,3 +210,61 @@
 
         self.assertThat(slideshow_view.visible, Eventually(Equals(False)))
         self.assertThat(photogrid_view.visible, Eventually(Equals(True)))
+
+
+class TestCameraGalleryViewWithPhotosAndVideo(
+        TestCameraGalleryViewMixin, CameraAppTestCase):
+    """Tests the camera gallery view with two photos and a video"""
+
+    def setUp(self):
+        self.delete_all_media()
+        self.add_sample_photo()
+        self.add_sample_video()
+        super(TestCameraGalleryViewWithPhotosAndVideo, self).setUp()
+
+    def verify_share_state(self, expectedState, close=True):
+        gallery = self.main_window.get_gallery()
+        self.main_window.open_actions_drawer(gallery)
+
+        # verify expected state
+        share = gallery.wait_select_single(objectName="actionButtonShare")
+        self.assertThat(share.enabled, Eventually(Equals(expectedState)))
+
+        if (close):
+            self.main_window.close_actions_drawer(gallery)
+        else:
+            return share
+
+    """Tests share button enable or disabled correctly in multiselection"""
+    def test_multiselection_share_enabled(self):
+        self.main_window.swipe_to_gallery(self)
+        self.move_from_slideshow_to_photogrid()
+
+        # Verify options button disabled until we select something
+        gallery = self.main_window.get_gallery()
+        opt = gallery.wait_select_single(objectName="additionalActionsButton")
+        self.assertThat(opt.visible, Eventually(Equals(False)))
+
+        # Verify that if we select one photo options and share are enabled
+        self.select_media(0)
+        self.assertThat(opt.visible, Eventually(Equals(True)))
+        self.verify_share_state(True)
+
+        # Verify that it stays enabled with mixed media selected
+        self.select_media(1)
+        self.verify_share_state(True)
+
+    """Tests sharing with mixed media generates a warning dialog"""
+    def test_no_share_mixed_media(self):
+        self.main_window.swipe_to_gallery(self)
+        self.move_from_slideshow_to_photogrid()
+
+        self.select_media(0)
+        self.select_media(1)
+        share = self.verify_share_state(True, close=False)
+
+        self.pointing_device.move_to_object(share)
+        self.pointing_device.click()
+
+        gallery = self.main_window.get_gallery()
+        gallery.wait_select_single(objectName="unableShareDialog")

=== modified file 'tests/autopilot/camera_app/tests/test_options.py'
--- tests/autopilot/camera_app/tests/test_options.py	2016-02-25 13:42:01 +0000
+++ tests/autopilot/camera_app/tests/test_options.py	2016-03-23 15:42:41 +0000
@@ -16,14 +16,6 @@
 class TestCameraOptions(CameraAppTestCase):
     """Tests the options overlay"""
 
-    """ This is needed to wait for the application to start.
-        In the testfarm, the application may take some time to show up."""
-    def setUp(self):
-        super(TestCameraOptions, self).setUp()
-        # FIXME: this should be in parent class
-        self.assertThat(
-            self.main_window.get_qml_view().visible, Eventually(Equals(True)))
-
     """Test that the options overlay closes properly by tapping"""
     def test_overlay_tap_to_close(self):
         bottom_edge = self.main_window.get_bottom_edge()

=== modified file 'tests/autopilot/camera_app/tests/test_photo_editor.py'
--- tests/autopilot/camera_app/tests/test_photo_editor.py	2015-07-07 11:09:05 +0000
+++ tests/autopilot/camera_app/tests/test_photo_editor.py	2016-03-23 15:42:41 +0000
@@ -20,13 +20,7 @@
     def setUp(self):
         self.delete_all_media()
         self.add_sample_photo()
-
         super(TestCameraPhotoEditorWithPhoto, self).setUp()
-        self.assertThat(
-            self.main_window.get_qml_view().visible, Eventually(Equals(True)))
-
-    def tearDown(self):
-        super(TestCameraPhotoEditorWithPhoto, self).tearDown()
 
     """Tests editor opening and closing correctly for pictures"""
     def test_editor_appears(self):
@@ -37,11 +31,7 @@
         self.main_window.swipe_to_gallery(self)
 
         self.assertThat(gallery.inView, Eventually(Equals(True)))
-
-        # open actions drawer
-        opt = gallery.wait_select_single(objectName="additionalActionsButton")
-        self.pointing_device.move_to_object(opt)
-        self.pointing_device.click()
+        self.main_window.open_actions_drawer(gallery)
 
         # If the editor button is not there when in the gallery view, then
         # we are not on a system that has the UI extras package installed or
@@ -77,13 +67,7 @@
     def setUp(self):
         self.delete_all_media()
         self.add_sample_video()
-
         super(TestCameraPhotoEditorWithVideo, self).setUp()
-        self.assertThat(
-            self.main_window.get_qml_view().visible, Eventually(Equals(True)))
-
-    def tearDown(self):
-        super(TestCameraPhotoEditorWithVideo, self).tearDown()
 
     """Tests editor not being available for videos"""
     def test_editor_not_on_videos(self):
@@ -95,11 +79,7 @@
         self.main_window.swipe_to_gallery(self)
 
         self.assertThat(gallery.inView, Eventually(Equals(True)))
-
-        # open actions drawer
-        opt = gallery.wait_select_single(objectName="additionalActionsButton")
-        self.pointing_device.move_to_object(opt)
-        self.pointing_device.click()
+        self.main_window.open_actions_drawer(gallery)
 
         # If the editor button is not there when in the gallery view, then
         # we are not on a system that has the UI extras package installed or

=== modified file 'tests/autopilot/camera_app/tests/test_zoom.py'
--- tests/autopilot/camera_app/tests/test_zoom.py	2016-01-11 17:07:21 +0000
+++ tests/autopilot/camera_app/tests/test_zoom.py	2016-03-23 15:42:41 +0000
@@ -19,16 +19,6 @@
 class TestCameraZoom(CameraAppTestCase):
     """Tests the main camera features"""
 
-    """ This is needed to wait for the application to start.
-        In the testfarm, the application may take some time to show up."""
-    def setUp(self):
-        super(TestCameraZoom, self).setUp()
-        self.assertThat(
-            self.main_window.get_qml_view().visible, Eventually(Equals(True)))
-
-    def tearDown(self):
-        super(TestCameraZoom, self).tearDown()
-
     def activate_zoom(self):
         viewfinder = self.main_window.get_viewfinder_geometry()
         viewfinder_center = self.get_center(viewfinder)

=== modified file 'tests/unittests/CMakeLists.txt'
--- tests/unittests/CMakeLists.txt	2016-02-26 15:24:03 +0000
+++ tests/unittests/CMakeLists.txt	2016-03-23 15:42:41 +0000
@@ -7,7 +7,7 @@
 add_executable(tst_QmlTests tst_QmlTests.cpp)
 qt5_use_modules(tst_QmlTests Core Qml Quick Test QuickTest)
 target_link_libraries(tst_QmlTests ${TPL_QT5_LIBRARIES})
-add_test(tst_QmlTests ${XVFB_RUN_CMD} ${CMAKE_CURRENT_BINARY_DIR}/tst_QmlTests -import ${CMAKE_SOURCE_DIR})
+add_test(tst_QmlTests ${XVFB_RUN_CMD} ${CMAKE_CURRENT_BINARY_DIR}/tst_QmlTests -import ${CMAKE_SOURCE_DIR} -import ${CMAKE_BINARY_DIR})
 
 # copy qml test files to build dir
 file(GLOB qmlTestFiles RELATIVE ${CMAKE_SOURCE_DIR}/tests/unittests/ *qml)

=== added file 'tests/unittests/tst_PhotogridView.qml'
--- tests/unittests/tst_PhotogridView.qml	1970-01-01 00:00:00 +0000
+++ tests/unittests/tst_PhotogridView.qml	2016-03-23 15:42:41 +0000
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+import QtQuick 2.4
+import QtTest 1.0
+import "../../"
+import "../../.." //Needed for out of source build
+
+TestCase {
+    name: "PhotogridView"
+
+    function test_mixedMediaSelection_data() {
+        return [
+            { // one item only
+                isMixedMedia: false,
+                listItems: [
+                    { fileType: "image", selected: true, fileURL: "" }
+                ]
+            },
+            { // mixed media but only non-mixed selected
+                isMixedMedia: false,
+                listItems: [
+                      { fileType: "video", selected: false, fileURL: "" },
+                      { fileType: "image", selected: true, fileURL: "" },
+                      { fileType: "image", selected: true, fileURL: "" }
+                ]
+            },
+            { // mixed media
+                isMixedMedia: true,
+                listItems: [
+                      { fileType: "video", selected: true, fileURL: "" },
+                      { fileType: "image", selected: true, fileURL: "" },
+                      { fileType: "image", selected: true, fileURL: "" }
+                ]
+            },
+        ];
+    }
+
+    function test_mixedMediaSelection(data) {
+        list.clear()
+        list.data = data.listItems;
+        for (var i = 0; i < data.listItems.length; i++) {
+            list.append(data.listItems[i]);
+        }
+        list.updateSelectedFiles();
+        grid.model = list
+        compare(grid.selectionContainsMixedMedia(), data.isMixedMedia, "Mixed media not detected correctly")
+    }
+
+    ListModel {
+        id: list
+        property var data
+        property var selectedFiles: []
+        function updateSelectedFiles() {
+            // need to re-assign entire list due to the way list properties work in QML
+            var selected = [];
+            for (var i = 0; i < list.count; i++) {
+                if (list.data[i].selected) selected.push(i);
+            }
+            list.selectedFiles = selected;
+        }
+        function get(i, key) {
+            return list.data[i][key];
+        }
+    }
+
+    PhotogridView {
+        id: grid
+        width: 600
+        height: 800
+        inView: true
+        inSelectionMode: true
+    }
+}