Merge lp:~mterry/unity8/we-are-at-least-beta into lp:unity8

[Michael Terry]

Drop the "EARLY ALPHA" scare label when running in testing mode.

A) We are past early alpha stages by this point.
B) It's distracting when trying to test unity8. I doubt anyone that is running "./run.sh -f" really needs to be reminded that they are testing it.

Drop the "EARLY ALPHA" scare label when running in testing mode.

A) We are past early alpha stages by this point.
B) It's distracting when trying to test unity8. I doubt anyone that is running "./run.sh -f" really needs to be reminded that they are testing it.

== Checklist ==

 * 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?
 NA

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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1434
http://jenkins.qa.ubuntu.com/job/unity8-ci/4893/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/177
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/70
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/58
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/58
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/166
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/177
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/177/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15770

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

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

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

Did you really? :P

review: Needs Fixing

[Michael Terry (mterry)]

Tags should be fixed.

[Michael Zanetti (mzanetti)]

hmm... seems they are fixed a bit too much... don't have a single tag around any more after freshly checking out that branch.

[lp:~mterry/unity8/we-are-at-least-beta]

1435. By Michael Terry on 2014-11-13

Merge from trunk

[Michael Zanetti (mzanetti)]

I for one am not sure if we really are beta on the desktop already. However, this text is only triggered if we're using the fake application manager. Nowadays though, we're using QtMir in the desktop session too, so this shows up only when developing.

=> +1 on dropping it.

 * 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.

as much as it could. no issues introduced here.

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

hell yeah, I did :D

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1435
http://jenkins.qa.ubuntu.com/job/unity8-ci/4906/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/224
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/83
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/71
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/71
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/200
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/224
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/224/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15870

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

review: Needs Fixing (continuous-integration)

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2014-11-07 14:30:42 +0000
+++ qml/Shell.qml	2014-11-13 15:09:10 +0000
@@ -776,26 +776,10 @@
         }
     }
 
-    Label {
-        id: alphaDisclaimerLabel
-        anchors.centerIn: parent
-        visible: ApplicationManager.fake ? ApplicationManager.fake : false
-        z: dialogs.z + 10
-        text: "EARLY ALPHA\nNOT READY FOR USE"
-        color: "lightgrey"
-        opacity: 0.2
-        font.weight: Font.Black
-        horizontalAlignment: Text.AlignHCenter
-        verticalAlignment: Text.AlignVCenter
-        fontSizeMode: Text.Fit
-        rotation: -45
-        scale: Math.min(parent.width, parent.height) / width
-    }
-
     EdgeDemo {
         id: edgeDemo
         objectName: "edgeDemo"
-        z: alphaDisclaimerLabel.z + 10
+        z: dialogs.z + 10
         paused: Powerd.status === Powerd.Off // Saves power
         greeter: greeter
         launcher: launcher