Merge lp:~dandrader/unity8/post-prompts-in-prompts-tweaks into lp:unity8

[Daniel d'Andrada]

Some ApplicationWindow test improvements

Some fixes that didn't make into https://code.launchpad.net/~nick-dedekind/unity8/prompts-in-prompts/+merge/232362

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

* 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?
Not applicable

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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1234
http://jenkins.qa.ubuntu.com/job/unity8-ci/4236/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4463
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1237
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1330
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1330
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4239
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5715
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5715/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12670

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

review: Needs Fixing (continuous-integration)

[lp:~dandrader/unity8/post-prompts-in-prompts-tweaks]

1234. By Launchpad Translations on behalf of unity-team on 2014-09-05

Launchpad automatic translations update.

1235. By Launchpad Translations on behalf of unity-team on 2014-09-07

Launchpad automatic translations update.

1236. By Launchpad Translations on behalf of unity-team on 2014-09-08

Launchpad automatic translations update.

1237. By Nick Dedekind on 2014-09-08

Support for nested prompt session. Fixes: 1358388, 1363081
Approved by: Michał Sawicz, Daniel d'Andrada

1238. By Albert Astals Cid on 2014-09-08

Remove unused hasAttributes variable
Approved by: Ying-Chun Liu

1239. By Albert Astals Cid on 2014-09-08

Disable dash overview if in temp scope preview
Approved by: Michał Sawicz, Andrea Cimitan

1240. By Michał Sawicz on 2014-09-08

Use a single white pixel instead of the heavier checkers image.
Approved by: Andrea Cimitan

1241. By Diego Sarmentero on 2014-09-08

- Reset button state on cancel Fixes: 1362622
Approved by: Michał Sawicz

1242. By Albert Astals Cid on 2014-09-08

Block mouse events under scope overview bottombar Fixes: 1362206
Approved by: Andrea Cimitan

1243. By Michael Terry on 2014-09-08

Don't show greeter when screen turns off during a call, even if proximity sensor isn't active. Fixes: 1347001
Approved by: Michał Sawicz, Albert Astals Cid

1244. By Albert Astals Cid on 2014-09-08

Fix regression in focus handling due to SDK change
Approved by: Michael Zanetti, PS Jenkins bot

1245. By Albert Astals Cid on 2014-09-08

Fix warning 'Background.qml:81:21: Unable to assign bool to QUrl'

Approved by: Michael Zanetti

1246. By Michael Terry on 2014-09-08

Add support to unlock-device for the new adbd coming down the pipeline. Also fix autopilot tests and run scripts for that.
Approved by: Gerry Boland

1247. By Albert Astals Cid on 2014-09-08

Fix launcher internationalization

Call textdomain and use X-Ubuntu-Gettext-Domain

bindtextdomain doesn't set the text domain, only the folder the domain has to be looked for. Fixes: 1354516
Approved by: Michael Zanetti

1248. By Albert Astals Cid on 2014-09-08

Make swipe and home button press in the launcher dismiss the overview

Moved the logic that does not change the current scope on swipe from the shell to the dash Fixes: 1355359
Approved by: Michael Zanetti

1249. By Michael Zanetti on 2014-09-08

open the application when clicking on the title entry in the quicklist Fixes: 1336380
Approved by: Albert Astals Cid

1250. By Albert Astals Cid on 2014-09-08

GSV: Use proper variable since altnav renames
Approved by: Michał Sawicz

1251. By Albert Astals Cid on 2014-09-08

Fix some "Cannot read property 'luminance' of null" warnings

Approved by: Michał Sawicz

1252. By Michał Sawicz on 2014-09-08

Make LVWPH non interactive while on header animation

Otherwise the contentY change fights with the animation also wanting to change contentY Fixes: 1251597, 1355473
Approved by: Michał Sawicz

1253. By Michał Sawicz on 2014-09-08

Improve references to scope/scopeStyle in PreviewListView and PageHeader, add tests.
Approved by: Andrea Cimitan, PS Jenkins bot

1254. By Mirco Müller on 2014-09-08

Implemented the needed visual updates on notifications requested by Design for RTM. Fixes: 1348092, 1365987
Approved by: Daniel d'Andrada

1255. By Michael Zanetti on 2014-09-08

Don't animate x while dragging apps from the left edge Fixes: 1360105
Approved by: Daniel d'Andrada

1256. By PS Jenkins bot on 2014-09-08

Releasing 8.00+14.10.20140908.1-0ubuntu1

1257. By PS Jenkins bot on 2014-09-09

Resync trunk

[Michał Sawicz (saviq)]

Please run http://people.canonical.com/~msawicz/unity8/strip-u8-tags.py on this branch and any local checkouts you might have.

[lp:~dandrader/unity8/post-prompts-in-prompts-tweaks]

1258. By Launchpad Translations on behalf of unity-team on 2014-09-10

Launchpad automatic translations update.

1259. By Daniel d'Andrada on 2014-09-10

Some test improvements

[Nick Dedekind (nick-dedekind)]

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

 * Did CI run pass? If not, please explain why.
No - test succeeds on my machine. Waiting for new CI build

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1259
http://jenkins.qa.ubuntu.com/job/unity8-ci/4268/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4695
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1269/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1362
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1362
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4464
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5947
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5947/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13021

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1259
http://jenkins.qa.ubuntu.com/job/unity8-ci/4277/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4727/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1278
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1371
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1371
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4498/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5979
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5979/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13068

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1259
http://jenkins.qa.ubuntu.com/job/unity8-ci/4298/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4781/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1299
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1392
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1392
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4548/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6033
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6033/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13134

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Any reason this is approved but not top approved?

=== modified file 'tests/qmltests/Stages/RecursingChildSessionControl.qml'
--- tests/qmltests/Stages/RecursingChildSessionControl.qml	2014-08-29 14:50:49 +0000
+++ tests/qmltests/Stages/RecursingChildSessionControl.qml	2014-09-10 16:06:39 +0000
@@ -93,7 +93,7 @@
                 onCheckedChanged: {
                     if (checked) {
                         root.session.createSurface();
-                    } else if (root.session.surface) {
+                    } else if (root.session && root.session.surface) {
                         ApplicationTest.removeSurface(root.session.surface);
                     }
                 }

=== modified file 'tests/qmltests/Stages/tst_ApplicationWindow.qml'
--- tests/qmltests/Stages/tst_ApplicationWindow.qml	2014-09-02 23:25:33 +0000
+++ tests/qmltests/Stages/tst_ApplicationWindow.qml	2014-09-10 16:06:39 +0000
@@ -52,20 +52,15 @@
             application: fakeApplication
         }
     }
-    FocusScope {
-        id: appFocus
+    Loader {
+        id: applicationWindowLoader
         anchors {
             top: parent.top
             bottom: parent.bottom
             left: parent.left
         }
         width: units.gu(40)
-
-        Loader {
-            id: applicationWindowLoader
-            anchors.fill: parent
-            sourceComponent: applicationWindowComponent
-        }
+        sourceComponent: applicationWindowComponent
     }
 
     Rectangle {
@@ -73,7 +68,7 @@
         anchors {
             top: parent.top
             bottom: parent.bottom
-            left: appFocus.right
+            left: applicationWindowLoader.right
             right: parent.right
         }
 
@@ -384,15 +379,19 @@
             verify(stateGroup.state === "void");
         }
 
-        // should be forcing active focus when interactive changes,
-        // which will cause a FocusScope higher in the object hierarchy tp be given the focus
         function test_forceActiveFocusFollowsInterative() {
             fakeApplication.createSession();
             applicationWindowLoader.item.interactive = false;
             applicationWindowLoader.item.interactive = true;
             fakeSession.createSurface();
 
-            compare(appFocus.focus, true);
+            compare(fakeSession.surface.activeFocus, true);
+
+            applicationWindowLoader.item.interactive = false;
+            compare(fakeSession.surface.activeFocus, false);
+
+            applicationWindowLoader.item.interactive = true;
+            compare(fakeSession.surface.activeFocus, true);
         }
     }
 }