Merge lp:~osomon/webbrowser-app/exit-fullscreen-bg into lp:webbrowser-app

[Olivier Tilloy]

Always exit fullscreen mode when the application becomes inactive.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:966
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1635/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2207
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/393
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/393
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/393/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/393
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1937
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2205
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2205/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19582

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

review: Approve (continuous-integration)

[lp:~osomon/webbrowser-app/exit-fullscreen-bg]

967. By Olivier Tilloy on 2015-04-17

Display a hint when entering fullscreen to inform the user how to exit.

968. By Olivier Tilloy on 2015-04-17

Actually exit fullscreen mode when dragging the bottom edge upwards.

969. By Olivier Tilloy on 2015-04-17

Show the bottom edge hint while the text message is visible.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:969
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1666/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2311
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/423
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/423
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/423/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/423
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2029
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2309
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2309/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19747

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

review: Needs Fixing (continuous-integration)

[lp:~osomon/webbrowser-app/exit-fullscreen-bg]

970. By Olivier Tilloy on 2015-04-17

On non-mobile form factors, hook up the ESC key to exiting fullscreen.

971. By Olivier Tilloy on 2015-04-17

Do not delay the destruction of the hint when exiting fullscreen.

972. By Olivier Tilloy on 2015-04-17

New autopilot test to exit fullscreen.

973. By Olivier Tilloy on 2015-04-17

Remove superfluous comment.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:971
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1670/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2321
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/427
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/427
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/427/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/427
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2319
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2319/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:973
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1671/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2323/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/428
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/428
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/428/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/428
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2322
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2322/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:973
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1673/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2329
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/430
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/430
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/430/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/430
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2043
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2327
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2327/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19775

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

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

works well

review: Approve

=== modified file 'src/app/webbrowser/Browser.qml'
--- src/app/webbrowser/Browser.qml	2015-04-07 17:10:56 +0000
+++ src/app/webbrowser/Browser.qml	2015-04-17 15:49:06 +0000
@@ -129,6 +129,13 @@
                 top: recentView.visible ? invisibleTabChrome.bottom : parent.top
             }
             height: parent.height - osk.height - (recentView.visible ? invisibleTabChrome.height : 0)
+
+            Keys.onEscapePressed: {
+                if (browser.currentWebview && browser.currentWebview.fullscreen) {
+                    event.accepted = true
+                    browser.currentWebview.fullscreen = false
+                }
+            }
         }
 
         Loader {
@@ -399,10 +406,14 @@
 
         enabled: (formFactor == "mobile") && (recentView.state == "") &&
                  (Screen.orientation == Screen.primaryOrientation) &&
-                 browser.currentWebview && !browser.currentWebview.fullscreen
+                 browser.currentWebview
 
         onDraggingChanged: {
-            if (!dragging) {
+            if (dragging) {
+                if (browser.currentWebview) {
+                    browser.currentWebview.fullscreen = false
+                }
+            } else {
                 if (stage == 1) {
                     if (tabsModel.count > 1) {
                         tabslist.selectAndAnimateTab(1)
@@ -422,12 +433,14 @@
     }
 
     Image {
+        id: bottomEdgeHint
         objectName: "bottomEdgeHint"
         source: (formFactor == "mobile") ? "assets/bottom_edge_hint.png" : ""
+        property bool forceShow: false
         anchors {
             horizontalCenter: parent.horizontalCenter
             bottom: parent.bottom
-            bottomMargin: (chrome.state == "shown") ? 0 : -height
+            bottomMargin: (((chrome.state == "shown") && browser.currentWebview && !browser.currentWebview.fullscreen) || forceShow) ? 0 : -height
             Behavior on bottomMargin {
                 UbuntuNumberAnimation {}
             }
@@ -643,6 +656,65 @@
                     }
                 }
 
+                onFullscreenChanged: {
+                    if (fullscreen) {
+                        fullscreenExitHintComponent.createObject(webviewimpl)
+                    }
+                }
+                Component {
+                    id: fullscreenExitHintComponent
+
+                    Rectangle {
+                        id: fullscreenExitHint
+                        objectName: "fullscreenExitHint"
+
+                        anchors.centerIn: parent
+                        height: units.gu(6)
+                        width: Math.min(units.gu(50), parent.width - units.gu(12))
+                        radius: units.gu(1)
+                        color: "#3e3b39"
+                        opacity: 0.85
+
+                        Behavior on opacity {
+                            UbuntuNumberAnimation {
+                                duration: UbuntuAnimation.SlowDuration
+                            }
+                        }
+                        onOpacityChanged: {
+                            if (opacity == 0.0) {
+                                fullscreenExitHint.destroy()
+                            }
+                        }
+
+                        Label {
+                            color: "white"
+                            font.weight: Font.Light
+                            anchors.centerIn: parent
+                            text: (formFactor == "mobile") ?
+                                      i18n.tr("Swipe Up To Exit Full Screen") :
+                                      i18n.tr("Press ESC To Exit Full Screen")
+                        }
+
+                        Timer {
+                            running: true
+                            interval: 2000
+                            onTriggered: fullscreenExitHint.opacity = 0
+                        }
+
+                        Connections {
+                            target: webviewimpl
+                            onFullscreenChanged: {
+                                if (!webviewimpl.fullscreen) {
+                                    fullscreenExitHint.destroy()
+                                }
+                            }
+                        }
+
+                        Component.onCompleted: bottomEdgeHint.forceShow = true
+                        Component.onDestruction: bottomEdgeHint.forceShow = false
+                    }
+                }
+
                 Loader {
                     id: newTabViewLoader
                     anchors.fill: parent
@@ -818,6 +890,9 @@
         onStateChanged: {
             if (Qt.application.state != Qt.ApplicationActive) {
                 session.save()
+                if (browser.currentWebview) {
+                    browser.currentWebview.fullscreen = false
+                }
             }
         }
         onAboutToQuit: session.save()

=== modified file 'tests/autopilot/webbrowser_app/tests/test_fullscreen.py'
--- tests/autopilot/webbrowser_app/tests/test_fullscreen.py	2014-12-13 02:46:27 +0000
+++ tests/autopilot/webbrowser_app/tests/test_fullscreen.py	2015-04-17 15:49:06 +0000
@@ -1,6 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright 2014 Canonical
+# Copyright 2014-2015 Canonical
 #
 # 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
@@ -18,11 +18,12 @@
 
 from testtools.matchers import Equals, LessThan
 from autopilot.matchers import Eventually
+from autopilot.platform import model
 
 
 class TestFullscreen(StartOpenRemotePageTestCaseBase):
 
-    # Ref: http://qt-project.org/doc/qt-5/qwindow.html#Visibility-enum
+    # Ref: http://doc.qt.io/qt-5/qwindow.html#Visibility-enum
     QWINDOW_FULLSCREEN = 5
 
     def assert_eventually_windowed(self):
@@ -46,6 +47,20 @@
         webview = self.main_window.get_current_webview()
         self.pointing_device.click_object(webview)
         self.assert_eventually_fullscreen()
+        hint = webview.wait_select_single(objectName="fullscreenExitHint")
+        self.pointing_device.click_object(webview)
+        self.assert_eventually_windowed()
+        hint.wait_until_destroyed()
+
+    def test_exit_fullscreen(self):
+        url = self.base_url + "/fullscreen"
+        self.main_window.go_to_url(url)
+        self.main_window.wait_until_page_loaded(url)
         webview = self.main_window.get_current_webview()
         self.pointing_device.click_object(webview)
+        self.assert_eventually_fullscreen()
+        if model() == 'Desktop':
+            self.keyboard.press_and_release('Escape')
+        else:
+            self.open_tabs_view()
         self.assert_eventually_windowed()