Merge lp:~uriboni/camera-app/handle-selfie-key into lp:camera-app

[Ugo Riboni]

Handle various keypresses that are used by selfie sticks to trigger shooting

Handle various keypresses that are used by selfie sticks to trigger shooting

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:624
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~uriboni/camera-app/handle-selfie-key/+merge/283992/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/camera-app-ci/482/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/177
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/178
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/178/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/177
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/380
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/1051
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/934
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27054

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

review: Needs Fixing (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Grabbed the deb from the jenkins run and installed it on my bq e4.5. I paired my selfie button and when I press the Android (enter key) button, nothing happens. When I press the iOS button (vol+) I get the volume overlay appear. Like this:-

http://people.canonical.com/~alan/screenshots/device-2016-02-03-113625.png

No photos are taken.

[Florian Boucault (fboucault)]

@Ugo: Submitted against wrong branch.
@Alan: camera is distributed as a click app so installing the deb while the original click is installed would cause the click to be run instead of the deb version.

[Florian Boucault (fboucault)]

There were changes to keyboard handling in staging in the meantime, please make sure it merges with no breakages.

review: Needs Fixing

Unmerged revisions

624. By Ugo Riboni on 2016-01-04

Shoot a picture on almost all media keys
with the exception of those used by the system for volume up and down

623. By Ugo Riboni on 2016-01-04

Merge changes from trunk

622. By Ugo Riboni on 2015-12-14

Focus the overlay so that it can receive keypresses, and then handle the togglePlayPause media key to shoot a picture

=== modified file 'ViewFinderOverlay.qml'
--- ViewFinderOverlay.qml	2016-01-11 15:07:58 +0000
+++ ViewFinderOverlay.qml	2016-01-26 16:02:22 +0000
@@ -38,6 +38,24 @@
         focusRing.show();
     }
 
+    readonly property var mediaKeys: [
+        Qt.Key_MediaPlay, Qt.Key_MediaStop, Qt.Key_MediaPrevious,
+        Qt.Key_MediaNext, Qt.Key_MediaRecord, Qt.Key_MediaPause,
+        Qt.Key_MediaTogglePlayPause,
+        // Note that Qt.Key_VolumeUp and Qt.Key_VolumeDown are not handled as
+        // they conflict with the hardware volume buttons on the device.
+        // We also handle the following media keysyms which are not mapped in
+        // the Qt namespace but are emitted by selfie sticks and defined in xkbcommon-keysyms.h:
+        // XKB_KEY_XF86AudioPlay, XKB_KEY_XF86AudioStop, XKB_KEY_XF86AudioPrev,
+        // XKB_KEY_XF86AudioNext, XKB_KEY_XF86AudioPause, XKB_KEY_XF86AudioMedia
+        // XKB_KEY_XF86AudioLowerVolume, XKB_KEY_XF86AudioRaiseVolume
+        0x1008FF14, 0x1008FF15, 0x1008FF16,
+        0x1008FF17, 0x1008FF31, 0x1008FF32,
+        0x1008FF11, 0x1008FF13,
+    ]
+
+    Keys.onPressed: if (mediaKeys.indexOf(event.key) != -1) shootButton.triggerShoot()
+
     Settings {
         id: settings
 
@@ -804,7 +822,17 @@
             state: (camera.captureMode == Camera.CaptureVideo) ?
                    ((camera.videoRecorder.recorderState == CameraRecorder.StoppedState) ? "record_off" : "record_on") :
                    "camera"
-            onClicked: {
+            onClicked: triggerShoot()
+            rotation: Screen.angleBetween(Screen.primaryOrientation, Screen.orientation)
+            Behavior on rotation {
+                RotationAnimator {
+                    duration: UbuntuAnimation.BriskDuration
+                    easing: UbuntuAnimation.StandardEasing
+                    direction: RotationAnimator.Shortest
+                }
+            }
+
+            function triggerShoot() {
                 if (camera.captureMode == Camera.CaptureVideo && camera.videoRecorder.recorderState == CameraRecorder.RecordingState) {
                     camera.videoRecorder.stop();
                 } else {
@@ -815,14 +843,6 @@
                     }
                 }
             }
-            rotation: Screen.angleBetween(Screen.primaryOrientation, Screen.orientation)
-            Behavior on rotation {
-                RotationAnimator {
-                    duration: UbuntuAnimation.BriskDuration
-                    easing: UbuntuAnimation.StandardEasing
-                    direction: RotationAnimator.Shortest
-                }
-            }
         }
 
         CircleButton {
 
=== modified file 'ViewFinderOverlayLoader.qml'
--- ViewFinderOverlayLoader.qml	2016-01-07 08:03:57 +0000
+++ ViewFinderOverlayLoader.qml	2016-01-26 16:02:22 +0000
@@ -37,4 +37,9 @@
     Component.onCompleted: {
         loader.setSource("ViewFinderOverlay.qml", { "camera": loader.camera });
     }
+
+    // If the source is set declaratively then the loaded item automatically
+    // get focus if the Loader has focus too. In this case we set the source later
+    // and therefore we need to focus the item explicitly.
+    onLoaded: item.focus = true
 }
 
=== modified file 'ViewFinderView.qml'
--- ViewFinderView.qml	2016-01-14 15:55:52 +0000
+++ ViewFinderView.qml	2016-01-26 16:02:22 +0000
@@ -22,7 +22,7 @@
 import QtGraphicalEffects 1.0
 import Ubuntu.Content 0.1
 
-Item {
+FocusScope {
     id: viewFinderView
 
     property bool overlayVisible: true
@@ -414,6 +414,7 @@
         id: viewFinderOverlay
 
         anchors.fill: parent
+        focus: true
         camera: camera
         opacity: status == Loader.Ready && overlayVisible && !photoRollHint.enabled ? 1.0 : 0.0
         Behavior on opacity {UbuntuNumberAnimation {duration: UbuntuAnimation.SnapDuration}}
 
=== modified file 'camera-app.qml'
--- camera-app.qml	2016-01-07 08:03:57 +0000
+++ camera-app.qml	2016-01-26 16:02:22 +0000
@@ -77,6 +77,7 @@
         anchors.fill: parent
         flickableDirection: state == "PORTRAIT" ? Flickable.HorizontalFlick : Flickable.VerticalFlick
         boundsBehavior: Flickable.StopAtBounds
+        focus: true
 
         property real panesMargin: units.gu(1)
         property real ratio
@@ -266,6 +267,7 @@
                 galleryView.showLastPhotoTaken();
                 galleryView.precacheThumbnail(filePath);
             }
+            focus: inView
         }
 
         GalleryViewLoader {
@@ -275,6 +277,7 @@
             inView: viewSwitcher.ratio > 0.0
             onExit: viewSwitcher.switchToViewFinder()
             opacity: inView ? 1.0 : 0.0
+            focus: inView
         }
     }