Merge lp:~kdub/mir/fix-1535780-android into lp:mir

[Kevin DuBois]

android: store the configuration change for the form_factor and scale in mga::Display.

part of the fix for LP: #1535780

android: store the configuration change for the form_factor and scale in mga::Display.

part of the fix for LP: #1535780

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:3251
https://mir-jenkins.ubuntu.com/job/mir-ci/88/
Executed test runs:
    None: https://mir-jenkins.ubuntu.com/job/generic-update-mp/88/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/88/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3251
http://jenkins.qa.ubuntu.com/job/mir-ci/6062/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5593
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4500
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5549
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-xenial-touch/302
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/386
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/386/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/386
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/386/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5546
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5546/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/8004
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26799
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/298
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/298/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-xenial-touch/154
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26808

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

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

Where's MOVE CORRESPONDING when you need it?

review: Approve

=== modified file 'src/platforms/android/server/display.cpp'
--- src/platforms/android/server/display.cpp	2015-12-21 15:16:20 +0000
+++ src/platforms/android/server/display.cpp	2016-01-19 20:13:25 +0000
@@ -261,6 +261,8 @@
             BOOST_THROW_EXCEPTION(std::logic_error("could not change display buffer format"));
 
         config[output.id].orientation = output.orientation;
+        config[output.id].form_factor = output.form_factor;
+        config[output.id].scale = output.scale;
 
         geom::Displacement offset(output.top_left - origin);
         config[output.id].top_left = output.top_left;

=== modified file 'tests/unit-tests/graphics/android/test_display.cpp'
--- tests/unit-tests/graphics/android/test_display.cpp	2016-01-06 20:19:48 +0000
+++ tests/unit-tests/graphics/android/test_display.cpp	2016-01-19 20:13:25 +0000
@@ -559,6 +559,53 @@
     });
 }
 
+//LP: #1535780
+TEST_F(Display, can_configure_orientation)
+{
+    mga::Display display(
+        stub_db_factory,
+        stub_gl_program_factory,
+        stub_gl_config,
+        null_display_report,
+        mga::OverlayOptimization::enabled);
+
+    auto scale = 4.2f;
+    auto config = display.configuration();
+    config->for_each_output([&scale](mg::UserDisplayConfigurationOutput const& c){
+        c.scale = scale;
+    });
+    display.configure(*config); 
+
+    config = display.configuration();
+    config->for_each_output([&scale](mg::UserDisplayConfigurationOutput const& c){
+        if (c.id == primary_output_id)
+            EXPECT_THAT(c.scale, testing::FloatEq(scale));
+    });
+}
+
+TEST_F(Display, can_configure_form_factor)
+{
+    mga::Display display(
+        stub_db_factory,
+        stub_gl_program_factory,
+        stub_gl_config,
+        null_display_report,
+        mga::OverlayOptimization::enabled);
+
+    auto form_factor = mir_form_factor_tablet;
+    auto config = display.configuration();
+    config->for_each_output([&form_factor](mg::UserDisplayConfigurationOutput const& c){
+        c.form_factor = form_factor;
+    });
+    display.configure(*config); 
+
+    config = display.configuration();
+    config->for_each_output([&form_factor](mg::UserDisplayConfigurationOutput const& c){
+        if (c.id == primary_output_id)
+            EXPECT_THAT(c.form_factor, testing::Eq(form_factor));
+    });
+}
+
 TEST_F(Display, keeps_subscription_to_hotplug)
 {
     using namespace testing;