Unity 8

Merge lp:~ted/unity8/on-the-screen into lp:unity8

  1. on-the-screen
  2. Merge into trunk
Proposed by Ted Gould
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 673
Merged at revision: 692
Proposed branch: lp:~ted/unity8/on-the-screen
Merge into: lp:unity8
Diff against target: 25 lines (+2/-2)
2 files modified
po/unity8.pot (+1/-1)
qml/Components/EdgeDemo.qml (+1/-1)
To merge this branch: bzr merge lp:~ted/unity8/on-the-screen
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Albert Astals Cid (community) Approve
Review via email: mp+203851@code.launchpad.net

Commit message

You can't tap anywhere

Description of the change

I started tapping on the table but the demo won't go away.

 * Are there any related MPs required for this MP to build/function as expected? Please list.
 * Did you perform an exploratory manual test run of your code change and any related functionality?
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
 * If you changed the UI, has there been a design review?

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:672
http://jenkins.qa.ubuntu.com/job/unity8-ci/2164/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2730
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2494/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1037
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/686
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/688
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/688/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/686
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2389
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2732
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2732/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2495
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2495/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4929/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3458

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) wrote :

Please answer checklist questions.

Revision history for this message
Ted Gould (ted) wrote :

On Fri, 2014-01-31 at 11:23 +0000, Michał Sawicz wrote:

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

Heh, no.

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

Heh, no.

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

No, didn't change any packaging.

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

No, if they want one they can have one. Tell me who to ping. It's a
pretty trivial change.

Revision history for this message
Albert Astals Cid (aacid) wrote :

Can you please run make pot_file in the builddir?

review: Needs Fixing
lp:~ted/unity8/on-the-screen updated
673. By Ted Gould

Updating the PO file to get the change

Revision history for this message
Albert Astals Cid (aacid) wrote :

 * 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, unrelated stuff still broken

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:673
http://jenkins.qa.ubuntu.com/job/unity8-ci/2260/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2979
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2711
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1130
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/781
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/783
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/783/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/781
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2618
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2981
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2981/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2712
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2712/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5134
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3712

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/unity8.pot'
2--- po/unity8.pot 2013-11-29 08:32:05 +0000
3+++ po/unity8.pot 2014-02-05 14:19:42 +0000
4@@ -61,7 +61,7 @@
5 #: Components/EdgeDemo.qml:227
6 msgid ""
7 "You have now mastered the edge gestures and can start using the "
8-"phone<br><br>Tap anywhere to start"
9+"phone<br><br>Tap on the screen to start"
10 msgstr ""
11
12 #: Components/PageHeader.qml:364
13
14=== modified file 'qml/Components/EdgeDemo.qml'
15--- qml/Components/EdgeDemo.qml 2013-12-04 13:24:06 +0000
16+++ qml/Components/EdgeDemo.qml 2014-02-05 14:19:42 +0000
17@@ -225,7 +225,7 @@
18 d.finalEdgeDemo = d.overlay.createObject(demo.underlay, {
19 "edge": "none",
20 "title": i18n.tr("Well done"),
21- "text": i18n.tr("You have now mastered the edge gestures and can start using the phone<br><br>Tap anywhere to start"),
22+ "text": i18n.tr("You have now mastered the edge gestures and can start using the phone<br><br>Tap on the screen to start"),
23 "anchors.fill": demo.dash,
24 "showSkip": false,
25 });

Subscribers

People subscribed via source and target branches