Merge lp:~andreas-pokorny/mir/disable-android-input-stack-when-platform-available into lp:mir

[Andreas Pokorny]

remove the test for x11-input

Since stub input is now only set during tests that need to use fake input devices the check for the server platform name is no longer necessary. As soon as an input platform is configured the android input stack is disabled.

Still this is not the final solution - Instead we should probe for available platforms and also allow loading multiple platforms

Since we just remove stub-input from the wrapper, and hence only see the input-stub library during test execution, there is currently no need to check for the input platform name inside DefaultServerConfiguration.

Hence from now on we disable the android input stack as soon as there is an input platform available.

[Alan Griffiths (alan-griffiths)]

Looks good. I'm not sure I'm up-to-date with the way Mir-on-X input works today, so I'd like Cemil to approve too.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2813
http://jenkins.qa.ubuntu.com/job/mir-ci/4483/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3418
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/274
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/946
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3366
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/632
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/632/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3366
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3366/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6155
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22340

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

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

lgtm

review: Approve

[Alberto Aguirre (albaguirre)]

Ok.

review: Approve

[Cemil Azizoglu (cemil-azizoglu)]

It works with mir-on-x.

So the assumption is no input platform will require Android input stack. I guess because input platforms are a replacement for it.

review: Approve

=== modified file 'src/server/input/default_configuration.cpp'
--- src/server/input/default_configuration.cpp	2015-07-23 02:39:20 +0000
+++ src/server/input/default_configuration.cpp	2015-08-05 13:02:46 +0000
@@ -378,30 +378,18 @@
 
                 std::shared_ptr<mi::InputManager> ret;
 
-                if (options->is_set(options::platform_input_lib))
-                {
-                    auto lib = std::make_shared<mir::SharedLibrary>(
-                        options->get<std::string>(options::platform_input_lib));
-
-                    auto describe = lib->load_function<mi::DescribeModule>(
-                        "describe_input_module",
-                        MIR_SERVER_INPUT_PLATFORM_VERSION);
-
-                    auto props = describe();
-                    ret = std::make_shared<mi::DefaultInputManager>(
-                        the_input_reading_multiplexer(),
-                        strcmp(props->name, "x11-input") ? the_legacy_input_dispatchable() :
-                                                           std::make_shared<NullLegacyInputDispatchable>());
-                }
-                else
-                {
-                    ret = std::make_shared<mi::DefaultInputManager>(
-                        the_input_reading_multiplexer(), the_legacy_input_dispatchable());
-                }
-
                 auto platform = the_input_platform();
                 if (platform)
+                {
+                    ret = std::make_shared<mi::DefaultInputManager>(the_input_reading_multiplexer(),
+                                                                    std::make_shared<NullLegacyInputDispatchable>());
                     ret->add_platform(platform);
+                }
+                else
+                {
+                    ret = std::make_shared<mi::DefaultInputManager>(
+                        the_input_reading_multiplexer(), the_legacy_input_dispatchable());
+                }
                 return ret;
             }
             else