Merge lp:~mzanetti/unity8/uninvert-launcher-in-desktop-mode into lp:unity8

[Michael Zanetti]

Uninvert Launcher in Desktop Mode

Also some little restruturing

 * Are there any related MPs required for this MP to build/function as expected? Please list.

yes, see prereqs

 * Did you perform an exploratory manual test run of your code change and any related functionality?

yes

 * Did you make sure that your branch does not contain spurious tags?

yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

n/a

 * If you changed the UI, has there been a design review?

err... not sure what to do with question this atm. So far I'm changing the obvious without touching the phone experience

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1452
http://jenkins.qa.ubuntu.com/job/unity8-ci/4941/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/297
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/118
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/106
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/106
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/270
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/297
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/297/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16064

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4941/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1453
http://jenkins.qa.ubuntu.com/job/unity8-ci/4943/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/300
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/120
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/108
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/108
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/273
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/300
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/300/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16067

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4943/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1454
http://jenkins.qa.ubuntu.com/job/unity8-ci/4946/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/303
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/123
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/111
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/111
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/276
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/303
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/303/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16096

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4946/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1455
http://jenkins.qa.ubuntu.com/job/unity8-ci/4948/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/308
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/125
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/113
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/113/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/281
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/308
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/308/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16106

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4948/rebuild

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

Tested and am happy, approved

* Did you perform an exploratory manual test run of the code change and any related functionality?
Y
 * Did CI run pass? If not, please explain why.
Just kicked off a new build, suspect other AP instability to blame here
 * Did you make sure that the branch does not contain spurious tags?
Y

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1455
http://jenkins.qa.ubuntu.com/job/unity8-ci/5003/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/449
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/180
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/168
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/168
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/394
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/449
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/449/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16401

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5003/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Text conflict in tests/qmltests/tst_Shell.qml
1 conflicts encountered.

Note: Was top approved before this.

review: Needs Fixing

[Michael Zanetti (mzanetti)]

> Text conflict in tests/qmltests/tst_Shell.qml
> 1 conflicts encountered.
>
> Note: Was top approved before this.

merged/resolved

[Albert Astals Cid (aacid)]

Text conflict in debian/unity8-common.install
1 conflicts encountered.

Note: Was top approved before this.

review: Needs Fixing

[lp:~mzanetti/unity8/uninvert-launcher-in-desktop-mode]

1457. By Michael Zanetti on 2014-12-05

merge prereq

1458. By Michael Zanetti on 2014-12-05

clip the launcher button

[Gerry Boland (gerboland)]

review: Approve

=== modified file 'qml/Launcher/Launcher.qml'
--- qml/Launcher/Launcher.qml	2014-11-19 17:43:09 +0000
+++ qml/Launcher/Launcher.qml	2014-12-05 11:28:53 +0000
@@ -24,6 +24,7 @@
     id: root
 
     property bool available: true // can be used to disable all interactions
+    property alias inverted: panel.inverted
 
     property int panelWidth: units.gu(8)
     property int dragAreaWidth: units.gu(1)
 
=== modified file 'qml/Launcher/LauncherPanel.qml'
--- qml/Launcher/LauncherPanel.qml	2014-11-20 10:19:40 +0000
+++ qml/Launcher/LauncherPanel.qml	2014-12-05 11:28:53 +0000
@@ -29,7 +29,7 @@
     rotation: inverted ? 180 : 0
 
     property var model
-    property bool inverted: true
+    property bool inverted: false
     property bool dragging: false
     property bool moving: launcherListView.moving || launcherListView.flicking
     property bool preventHiding: moving || dndArea.draggedIndex >= 0 || quickList.state === "open" || dndArea.pressed
@@ -54,6 +54,7 @@
             objectName: "buttonShowDashHome"
             width: parent.width
             height: units.gu(7)
+            clip: true
 
             UbuntuShape {
                 anchors {
 
=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2014-12-05 11:28:53 +0000
+++ qml/Shell.qml	2014-12-05 11:28:53 +0000
@@ -129,6 +129,11 @@
         sourceSize.width: 0
     }
 
+    GSettings {
+        id: usageModeSettings
+        schema.id: "com.canonical.Unity8"
+    }
+
     Binding {
         target: LauncherModel
         property: "applicationManager"
@@ -270,11 +275,6 @@
             source: usageModeSettings.usageMode === "Windowed" ? "Stages/DesktopStage.qml"
                         : tabletMode ? "Stages/TabletStage.qml" : "Stages/PhoneStage.qml"
 
-            GSettings {
-                id: usageModeSettings
-                schema.id: "com.canonical.Unity8"
-            }
-
             Binding {
                 target: applicationsDisplayLoader.item
                 property: "objectName"
@@ -733,10 +733,12 @@
             readonly property bool dashSwipe: progress > 0
 
             anchors.top: parent.top
+            anchors.topMargin: inverted ? 0 : panel.panelHeight
             anchors.bottom: parent.bottom
             width: parent.width
             dragAreaWidth: shell.edgeSize
             available: edgeDemo.launcherEnabled && (!shell.locked || AccountsService.enableLauncherWhileLocked) && !greeter.hasLockedApp
+            inverted: usageModeSettings.usageMode === "Staged"
 
             onShowDashHome: showHome()
             onDash: showDash()
 
=== added file 'qml/Stages/DecoratedWindow.qml'
--- qml/Stages/DecoratedWindow.qml	1970-01-01 00:00:00 +0000
+++ qml/Stages/DecoratedWindow.qml	2014-12-05 11:28:53 +0000
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2014 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/>.
+ *
+ * Authors: Michael Zanetti <[e-mail]>
+ */
+
+import QtQuick 2.3
+import Ubuntu.Components 1.1
+import Unity.Application 0.1
+
+Item {
+    id: root
+
+    property alias application: applicationWindow.application
+    property alias active: decoration.active
+
+    signal requestFocus();
+    signal close();
+    signal maximize();
+    signal minimize();
+
+    BorderImage {
+        anchors {
+            fill: root
+            margins: -units.gu(2)
+        }
+        source: "graphics/dropshadow2gu.sci"
+        opacity: .3
+        Behavior on opacity { UbuntuNumberAnimation {} }
+    }
+
+    WindowDecoration {
+        id: decoration
+        anchors { left: parent.left; top: parent.top; right: parent.right }
+        height: units.gu(3)
+        title: model.name
+        onClose: root.close();
+        onMaximize: root.maximize();
+        onMinimize: root.minimize();
+    }
+
+    ApplicationWindow {
+        id: applicationWindow
+        anchors.fill: parent
+        anchors.topMargin: units.gu(3)
+        interactive: index == 0
+    }
+}
 
=== modified file 'qml/Stages/DesktopStage.qml'
--- qml/Stages/DesktopStage.qml	2014-12-05 11:28:53 +0000
+++ qml/Stages/DesktopStage.qml	2014-12-05 11:28:53 +0000
@@ -61,9 +61,10 @@
 
         delegate: Item {
             id: appDelegate
-            height: units.gu(30)
-            width: units.gu(30)
             z: ApplicationManager.count - index
+            width: units.gu(60)
+            height: units.gu(50)
+
 
             states: [
                 State {
@@ -84,16 +85,6 @@
                 }
             ]
 
-            BorderImage {
-                anchors {
-                    fill: appDelegate
-                    margins: -units.gu(2)
-                }
-                source: "graphics/dropshadow2gu.sci"
-                opacity: .3
-                Behavior on opacity { UbuntuNumberAnimation {} }
-            }
-
             MouseArea {
                 anchors.fill: parent
                 anchors.margins: -units.gu(0.5)
@@ -141,21 +132,14 @@
                 }
             }
 
-            WindowDecoration {
-                anchors { left: parent.left; top: parent.top; right: parent.right }
-                height: units.gu(3)
-                title: model.name
+            DecoratedWindow {
+                anchors.fill: parent
+                application: ApplicationManager.get(index)
+                active: ApplicationManager.focusedApplicationId === model.appId
+
                 onClose: ApplicationManager.stopApplication(model.appId)
                 onMaximize: appDelegate.state = (appDelegate.state == "maximized" ? "normal" : "maximized")
                 onMinimize: appDelegate.state = "minimized"
-                active: ApplicationManager.focusedApplicationId == model.appId
-            }
-
-            ApplicationWindow {
-                anchors.fill: parent
-                anchors.topMargin: units.gu(3)
-                application: ApplicationManager.get(index)
-                interactive: index == 0
             }
         }
     }
 
=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml	2014-12-02 09:25:56 +0000
+++ tests/qmltests/tst_Shell.qml	2014-12-05 11:28:53 +0000
@@ -496,16 +496,8 @@
         function tapOnAppIconInLauncher() {
             var launcherPanel = findChild(shell, "launcherPanel");
 
-            // pick the first icon, the one at the bottom.
+            // pick the first icon, the one at the top.
             var appIcon = findChild(launcherPanel, "launcherDelegate0")
-
-            // Swipe upwards over the launcher to ensure that this icon
-            // at the bottom is not folded and faded away.
-            var touchStartX = launcherPanel.width / 2;
-            var touchEndY = launcherPanel.height / 2;
-            touchFlick(launcherPanel, touchStartX, 0, touchStartX, touchEndY);
-            tryCompare(launcherPanel, "moving", false);
-
             tap(appIcon, appIcon.width / 2, appIcon.height / 2);
         }
 
@@ -753,13 +745,17 @@
             dragLauncherIntoView();
 
             // Emulate a tap with a finger, where the touch position drifts during the tap.
+            // This is to test the touch ownership changes. The tap is happening on the button
+            // area but then drifting into the left edge drag area. This test makes sure
+            // the touch ownership stays with the button and doesn't move over to the
+            // left edge drag area.
             {
                 var buttonShowDashHome = findChild(launcher, "buttonShowDashHome");
                 var startPos = buttonShowDashHome.mapToItem(shell,
-                        buttonShowDashHome.width * 0.2,
+                        buttonShowDashHome.width * 0.8,
                         buttonShowDashHome.height * 0.2);
                 var endPos = buttonShowDashHome.mapToItem(shell,
-                        buttonShowDashHome.width * 0.8,
+                        buttonShowDashHome.width * 0.2,
                         buttonShowDashHome.height * 0.8);
                 touchFlick(shell, startPos.x, startPos.y, endPos.x, endPos.y);
             }