Merge lp:~unity-team/unity8/rtm-20150113 into lp:unity8/rtm-14.09

[Michał Sawicz]

[lp:~unity-team/unity8/rtm-20150113]

1424. By Michał Sawicz on 2015-01-14

Revert r1419, it's not ready yet.

1425. By Michał Sawicz on 2015-01-14

Merge prerequisite

[Michael Zanetti (mzanetti)]

as per original merges

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-01-14 10:25:02 +0000
+++ debian/changelog	2015-01-14 10:25:03 +0000
@@ -1,4 +1,18 @@
-unity8 (8.02+15.04.20150108~rtm--0ubuntu1) UNRELEASED; urgency=medium
+unity8 (8.02+15.04.20150113.1~rtm-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Albert Astals ]
+  * Fix going to scopes when the Manage Dash is open (LP: #1403464)
+
+  [ Josh Arenson ]
+  * Create a PhysicalKeyMapper to handle all physical/hardware keys (LP:
+    #1390393)
+
+  [ Michael Zanetti ]
+  * make spread reversible (LP: #1368668, #1355284, #1368677) 
+
+ -- Michał Sawicz <[e-mail]>  Tue, 13 Jan 2015 20:23:42 +0100
+
+unity8 (8.02+15.04.20150113~rtm-0ubuntu1) 14.09; urgency=medium
 
   [ Albert Astals ]
   * Use QImageReader not to load the image into memory twice
@@ -14,7 +28,7 @@
   * Don't block handling power events on loading the greeter's qml and the
     background image. (LP: #1383277)
 
- -- Michał Sawicz <[e-mail]>  Thu, 08 Jan 2015 14:02:47 +0100
+ -- Ubuntu daily release <[e-mail]>  Tue, 13 Jan 2015 15:18:13 +0000
 
 unity8 (8.02+15.04.20150107~rtm-0ubuntu1) 14.09; urgency=low
 

=== modified file 'qml/Dash/Dash.qml'
--- qml/Dash/Dash.qml	2014-12-15 23:03:04 +0000
+++ qml/Dash/Dash.qml	2015-01-14 10:25:03 +0000
@@ -36,9 +36,8 @@
                 dashContent.setCurrentScopeAtIndex(index, animate, isSwipe)
                 // Close dash overview and nested temp scopes in it
                 if (bottomEdgeController.progress != 0) {
-                    bottomEdgeController.enableAnimation = window.active && !scopesOverview.showingNonFavoriteScope;
+                    bottomEdgeController.enableAnimation = window.active;
                     bottomEdgeController.progress = 0;
-                    scopesOverview.closeTempScope();
                 }
                 // Close normal temp scopes (e.g. App Store)
                 if (scopeItem.scope) {

=== modified file 'qml/Stages/PhoneStage.qml'
--- qml/Stages/PhoneStage.qml	2014-10-30 21:42:32 +0000
+++ qml/Stages/PhoneStage.qml	2015-01-14 10:25:03 +0000
@@ -145,16 +145,16 @@
 
         // Those markers mark the various positions in the spread (ratio to screen width from right to left):
         // 0 - 1: following finger, snap back to the beginning on release
-        property real positionMarker1: 0.3
+        property real positionMarker1: 0.2
         // 1 - 2: curved snapping movement, snap to app 1 on release
-        property real positionMarker2: 0.45
+        property real positionMarker2: 0.3
         // 2 - 3: movement follows finger, snaps back to app 1 on release
-        property real positionMarker3: 0.6
+        property real positionMarker3: 0.35
         // passing 3, we detach movement from the finger and snap to 4
         property real positionMarker4: 0.9
 
         // This is where the first app snaps to when bringing it in from the right edge.
-        property real snapPosition: 0.75
+        property real snapPosition: 0.7
 
         // Phase of the animation:
         // 0: Starting from right edge, a new app (index 1) comes in from the right
@@ -178,7 +178,7 @@
             case 1:
                 if (shiftedContentX < width * positionMarker2) {
                     phase = 0;
-                } else if (shiftedContentX >= width * positionMarker4) {
+                } else if (shiftedContentX >= width * positionMarker4 && !spreadDragArea.dragging) {
                     phase = 2;
                 }
                 break;
@@ -270,6 +270,7 @@
 
             Repeater {
                 id: spreadRepeater
+                objectName: "spreadRepeater"
                 model: ApplicationManager
                 delegate: TransformedSpreadDelegate {
                     id: appDelegate
@@ -367,8 +368,9 @@
                         if (spreadView.phase == 0 && index < 2) {
                             if (progress < spreadView.positionMarker1) {
                                 return progress;
-                            } else if (progress < spreadView.positionMarker1 + snappingCurve.period){
-                                return spreadView.positionMarker1 + snappingCurve.value * 3;
+                            } else if (progress < spreadView.positionMarker1 + 0.05){
+                                // p : 0.05 = x : pm2
+                                return spreadView.positionMarker1 + (progress - spreadView.positionMarker1) * (spreadView.positionMarker2 - spreadView.positionMarker1) / 0.05
                             } else {
                                 return spreadView.positionMarker2;
                             }
@@ -380,13 +382,6 @@
                     visible: (progress >= 0 && progress < 1.7) ||
                              (isDash && priv.focusedAppDelegate.x !== 0)
 
-                    EasingCurve {
-                        id: snappingCurve
-                        type: EasingCurve.Linear
-                        period: 0.05
-                        progress: appDelegate.progress - spreadView.positionMarker1
-                    }
-
                     Binding {
                         target: appDelegate
                         property: "orientation"
@@ -425,16 +420,11 @@
         id: spreadDragArea
         objectName: "spreadDragArea"
         direction: Direction.Leftwards
-        enabled: spreadView.phase != 2 && root.spreadEnabled
+        enabled: (spreadView.phase != 2 && root.spreadEnabled) || dragging
 
         anchors { top: parent.top; right: parent.right; bottom: parent.bottom }
         width: root.dragAreaWidth
 
-        // Sitting at the right edge of the screen, this EdgeDragArea directly controls the spreadView when
-        // attachedToView is true. When the finger movement passes positionMarker3 we detach it from the
-        // spreadView and make the spreadView snap to positionMarker4.
-        property bool attachedToView: true
-
         property var gesturePoints: new Array()
 
         onTouchXChanged: {
@@ -443,15 +433,13 @@
                 spreadView.phase = 0;
                 spreadView.contentX = -spreadView.shift;
             }
-            if (dragging && status == DirectionalDragArea.Recognized && attachedToView) {
+            if (dragging && status == DirectionalDragArea.Recognized) {
                 // Gesture recognized. Let's move the spreadView with the finger
-                var finalX = Math.min(touchX + width, width);
-                spreadView.contentX = -finalX + spreadDragArea.width - spreadView.shift;
-            }
-            if (attachedToView && spreadView.shiftedContentX >= spreadView.width * spreadView.positionMarker3) {
-                // We passed positionMarker3. Detach from spreadView and snap it.
-                attachedToView = false;
-                spreadView.snap();
+                var dragX = Math.min(touchX + width, width); // Prevent dragging rightwards
+                dragX = -dragX + spreadDragArea.width - spreadView.shift;
+                // Don't allow dragging further than the animation crossing with phase2's animation
+                var maxMovement =  spreadView.width * spreadView.positionMarker4 - spreadView.shift;
+                spreadView.contentX = Math.min(dragX, maxMovement);
             }
             gesturePoints.push(touchX);
         }
@@ -462,10 +450,6 @@
         onStatusChanged: {
             previousStatus = currentStatus;
             currentStatus = status;
-
-            if (status == DirectionalDragArea.Recognized) {
-                attachedToView = true;
-            }
         }
 
         onDraggingChanged: {
@@ -493,7 +477,7 @@
                 // If it was a short one-way movement, do the Alt+Tab switch
                 // no matter if we didn't cross positionMarker1 yet.
                 spreadView.snapTo(1);
-            } else if (!dragging && attachedToView) {
+            } else if (!dragging) {
                 // otherwise snap to the closest snap position we can find
                 // (might be back to start, to app 1 or to spread)
                 spreadView.snap();

=== modified file 'qml/Stages/TabletStage.qml'
--- qml/Stages/TabletStage.qml	2014-10-30 21:42:32 +0000
+++ qml/Stages/TabletStage.qml	2015-01-14 10:25:03 +0000
@@ -590,7 +590,6 @@
         width: root.dragAreaWidth
         direction: Direction.Leftwards
 
-        property bool attachedToView: false
         property var gesturePoints: new Array()
 
         onTouchXChanged: {
@@ -599,22 +598,14 @@
                 spreadView.contentX = -spreadView.shift;
             }
 
-            if (dragging && attachedToView) {
-                spreadView.contentX = -touchX + spreadDragArea.width - spreadView.shift;
-                if (spreadView.shiftedContentX > spreadView.phase0Width + spreadView.phase1Width / 2) {
-                    attachedToView = false;
-                    spreadView.snap();
-                }
+            if (dragging) {
+                var dragX = -touchX + spreadDragArea.width - spreadView.shift;
+                var maxDrag = spreadView.width * spreadView.positionMarker4 - spreadView.shift;
+                spreadView.contentX = Math.min(dragX, maxDrag);
             }
             gesturePoints.push(touchX);
         }
 
-        onStatusChanged: {
-            if (status == DirectionalDragArea.Recognized) {
-                attachedToView = true;
-            }
-        }
-
         onDraggingChanged: {
             if (dragging) {
                 // Gesture recognized. Start recording this gesture
@@ -630,7 +621,7 @@
                 // If it was a short one-way movement, do the Alt+Tab switch
                 // no matter if we didn't cross positionMarker1 yet.
                 spreadView.snapTo(spreadView.nextInStack);
-            } else if (!dragging && attachedToView) {
+            } else if (!dragging) {
                 if (spreadView.shiftedContentX < spreadView.width * spreadView.positionMarker1) {
                     spreadView.snap();
                 } else if (spreadView.shiftedContentX < spreadView.width * spreadView.positionMarker2) {

=== modified file 'tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py'
--- tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py	2014-09-08 10:33:50 +0000
+++ tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py	2015-01-14 10:25:03 +0000
@@ -47,7 +47,7 @@
         height = self.main_window.height
         start_x = width
         start_y = int(height/2)
-        end_x = int(width/2)
+        end_x = int(width*3/4)
         end_y = start_y
 
         logger.info("Swiping screen from the right edge")

=== modified file 'tests/qmltests/Dash/tst_Dash.qml'
--- tests/qmltests/Dash/tst_Dash.qml	2014-12-15 23:03:04 +0000
+++ tests/qmltests/Dash/tst_Dash.qml	2015-01-14 10:25:03 +0000
@@ -411,5 +411,22 @@
             tryCompare(dashContentList, "currentIndex", 2);
             compare(dashContentList.currentItem.scopeId, "MockScope5");
         }
+
+        function test_manage_dash_close_dashCommunicator() {
+            var dashContentList = findChild(dash, "dashContentList");
+            compare(dashContentList.currentIndex, 0);
+            compare(dashContentList.currentItem.scopeId, "MockScope1");
+
+            // Show the manage dash
+            touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, units.gu(2));
+            var bottomEdgeController = findInvisibleChild(dash, "bottomEdgeController");
+            tryCompare(bottomEdgeController, "progress", 1);
+
+            var dashCommunicatorService = findInvisibleChild(dash, "dashCommunicatorService");
+            dashCommunicatorService.mockSetCurrentScope(1, true, false);
+
+            tryCompare(bottomEdgeController, "progress", 0);
+            tryCompare(dashContentList, "currentIndex", 1)
+        }
     }
 }

=== modified file 'tests/qmltests/Stages/tst_PhoneStage.qml'
--- tests/qmltests/Stages/tst_PhoneStage.qml	2014-10-30 21:41:56 +0000
+++ tests/qmltests/Stages/tst_PhoneStage.qml	2015-01-14 10:25:03 +0000
@@ -128,17 +128,20 @@
             var startX = phoneStage.width - 2;
             var startY = phoneStage.height / 2;
             var endY = startY;
-            var endX = units.gu(2);
+            var endX = phoneStage.width / 2;
 
             touchFlick(phoneStage, startX, startY, endX, endY,
                        true /* beginTouch */, true /* endTouch */, units.gu(10), 50);
+
+            tryCompare(spreadView, "phase", 2);
+            waitForRendering(phoneStage);
         }
 
         function test_shortFlick() {
             addApps(2)
             var startX = phoneStage.width - units.gu(1);
             var startY = phoneStage.height / 2;
-            var endX = phoneStage.width / 2;
+            var endX = startX - units.gu(4);
             var endY = startY;
 
             var activeApp = ApplicationManager.get(0);
@@ -164,7 +167,7 @@
                 {tag: "<position2 (non-linear)", positionMarker: "positionMarker2", linear: false, offset: -1, endPhase: 0, targetPhase: 0, newFocusedIndex: 1 },
                 {tag: ">position2", positionMarker: "positionMarker2", linear: true, offset: +1, endPhase: 1, targetPhase: 0, newFocusedIndex: 1 },
                 {tag: "<position3", positionMarker: "positionMarker3", linear: true, offset: -1, endPhase: 1, targetPhase: 0, newFocusedIndex: 1 },
-                {tag: ">position3", positionMarker: "positionMarker3", linear: true, offset: +1, endPhase: 2, targetPhase: 2, newFocusedIndex: 2 },
+                {tag: ">position3", positionMarker: "positionMarker3", linear: true, offset: +1, endPhase: 1, targetPhase: 2, newFocusedIndex: 2 },
             ];
         }