Merge lp:~mterry/unity8/platform-api into lp:unity8

[Michael Terry]

Rely on platform-api's headers for symbolic constants rather than hard-coding numbers.

Rely on platform-api's headers for symbolic constants rather than hard-coding numbers.

There are three changes here:

A) Set the "session" property of QPlatformNativeInterface rather than "ubuntuSessionType" -- it's been renamed and support for "ubuntuSessionType" will presumably go away at some point [1].

B) Use U_SYSTEM_SESSION rather than 1.

C) Use U_INDICATOR_ROLE rather than 2. This one is controversial. The old code suggests that 2 == INDICATOR_ACTOR_ROLE [2]. But 2 == U_DASH_ROLE instead of U_INDICATOR_ROLE. Even the log output in qtubuntu suggests that 2 is the "Indicator" role, though that logging code is clearly antiquated [3]. This whole problem is a case study in why we should use symbolic names. :) It doesn't even matter though, since the only role that does anything is U_ON_SCREEN_KEYBOARD_ROLE [4]. Plus, do we even want to set just one role for the whole unity8 window? Regardless, I've tried to leave the original intent by using U_INDICATOR_ROLE.

[1] See qtubuntu's src/platforms/ubuntu/ubuntucommon/integration.cc
[2] view->setProperty("role", 2); // INDICATOR_ACTOR_ROLE
[3] See qtubuntu's src/platforms/ubuntu/ubuntucommon/window.cc
[4] See platform-api's src/ubuntu/mirclient/window_properties_mirclient.cpp

== 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?
 - I built it.

 * 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?
 - I am on that team

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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:918
http://jenkins.qa.ubuntu.com/job/unity8-ci/3043/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/471
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/81
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/137
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/137
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/137/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/137
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/925
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/920
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/920/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7743

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

* Did you perform an exploratory manual test run of the code change and any related functionality?
Yes, works and the rationale on the description makes sense.

* Did CI run pass? If not, please explain why.
Known broken tests in process of being fixed.

review: Approve

[Albert Astals Cid (aacid)]

Text conflict in debian/control
1 conflicts encountered.

review: Needs Fixing

[Michael Terry (mterry)]

Merged from trunk

[Albert Astals Cid (aacid)]

review: Approve

[Gerry Boland (gerboland)]

I don't think these are of any use any more, they're a holdover from the surface flinger days. Try removing them and see if there's any consequences, I expect none

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:919
http://jenkins.qa.ubuntu.com/job/unity8-ci/3085/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/625
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/123
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/179
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/179
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/179/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/179
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1063
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1204
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1204/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8019

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:919
http://jenkins.qa.ubuntu.com/job/unity8-ci/3114/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/755
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1852/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/208
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/208
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/208/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/208
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1183
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1401
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1401/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8219

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:919
http://jenkins.qa.ubuntu.com/job/unity8-ci/3142/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/866/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/146/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/236/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/236/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/236/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1591/console

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

Text conflict in debian/control
1 conflicts encountered.

[Michał Sawicz (saviq)]

Description-en: dummy transitional package for libplatform-api-headers
 This is a dummy transitional package, please use libubuntu-application-api-headers
 instead.

review: Needs Fixing

[lp:~mterry/unity8/platform-api]

920. By Michael Terry on 2014-06-27

Update header package name

921. By Michael Terry on 2014-06-27

Merge from trunk

[Michael Terry (mterry)]

Updated header package to libubuntu-application-api-headers, good catch Saviq. Fixed merged conflict too.

As for Gerry's suggestion of removing this code completely and seeing if anything breaks yet, I believe this code is still used. "role" is only apparently used today if we are the OSK role, but that's in Mir code. So clearly Mir is reserving the right to care about the role we set.

As for the session property, that does seem to percolate down through to the Android layer and affect the oom scores and similar issues.

So I still think this merge is valid.

[Michał Sawicz (saviq)]

review: Abstain

[Michael Terry (mterry)]

Did you mean to abstain?

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:921
http://jenkins.qa.ubuntu.com/job/unity8-ci/3253/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1304
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/257
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/347
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/347
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/347/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/347
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1619
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2206
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2206/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8956

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

Yeah, I didn't really review it, so approving felt wrong.

[Albert Astals Cid (aacid)]

Text conflict in debian/control
1 conflicts encountered.

review: Needs Fixing

[lp:~mterry/unity8/platform-api]

922. By Michael Terry on 2014-07-14

Merge from trunk

[Michael Terry (mterry)]

I merged from trunk, resolving the conflict.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:922
http://jenkins.qa.ubuntu.com/job/unity8-ci/3433/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1974
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/434
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/527
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/527
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/527/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/527
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2219
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3089
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3089/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9823

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:922
http://jenkins.qa.ubuntu.com/job/unity8-ci/3437/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2002
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/438
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/531
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/531
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/531/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/531
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2241
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3120
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3120/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9850

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

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

Merge issues have been fixed

review: Abstain

[Gerry Boland (gerboland)]

> As for Gerry's suggestion of removing this code completely and seeing if
> anything breaks yet, I believe this code is still used. "role" is only
> apparently used today if we are the OSK role, but that's in Mir code. So
> clearly Mir is reserving the right to care about the role we set.
>
> As for the session property, that does seem to percolate down through to
> the Android layer and affect the oom scores and similar issues.

So I dug into this, and you're right, it's used still. Not for long however as QtComp makes this unnecessary.

review: Abstain

[Michael Terry (mterry)]

I'm going for the record of most abstains on a single merge! ;)

[Michael Zanetti (mzanetti)]

review: Abstain

[Michał Sawicz (saviq)]

review: Abstain

[Albert Astals Cid (aacid)]

Text conflict in src/main.cpp
1 conflicts encountered.

review: Needs Fixing

[Michael Terry (mterry)]

This has been made obsolete by Gerry's qtcompositor work.

review: Abstain

Unmerged revisions

922. By Michael Terry on 2014-07-14

Merge from trunk

921. By Michael Terry on 2014-06-27

Merge from trunk

920. By Michael Terry on 2014-06-27

Update header package name

919. By Michael Terry on 2014-06-03

Merge from trunk

918. By Michael Terry on 2014-05-26

Use libplatform-api-headers

=== modified file 'debian/control'
--- debian/control	2014-07-09 19:44:14 +0000
+++ debian/control	2014-07-14 15:31:16 +0000
@@ -19,6 +19,7 @@
                libpulse-dev,
                libqmenumodel-dev (>= 0.2.7),
                libqt5xmlpatterns5-dev,
+               libubuntu-application-api-headers,
                libunity-api-dev (>= 7.85),
                libunity-mir-dev,
                libusermetricsoutput1-dev,

=== modified file 'src/main.cpp'
--- src/main.cpp	2014-07-03 14:45:43 +0000
+++ src/main.cpp	2014-07-14 15:31:16 +0000
@@ -29,6 +29,8 @@
 #include <libintl.h>
 #include <dlfcn.h>
 #include <csignal>
+#include <ubuntu/application/ui/session.h>
+#include <ubuntu/application/ui/window_properties.h>
 
 // local
 #include <paths.h>
@@ -142,13 +144,9 @@
     }
 
     QPlatformNativeInterface* nativeInterface = QGuiApplication::platformNativeInterface();
-    /* Shell is declared as a system session so that it always receives all
-       input events.
-       FIXME: use the enum value corresponding to SYSTEM_SESSION_TYPE (= 1)
-       when it becomes available.
-    */
-    nativeInterface->setProperty("ubuntuSessionType", 1);
-    view->setProperty("role", 2); // INDICATOR_ACTOR_ROLE
+    // Shell is declared as a system session so that it always receives all input events.
+    nativeInterface->setProperty("session", U_SYSTEM_SESSION);
+    view->setProperty("role", U_INDICATOR_ROLE);
 
     QUrl source(::qmlDirectory()+"Shell.qml");
     prependImportPaths(view->engine(), ::overrideImportPaths());