QtMir

Merge lp:~gerboland/qtmir/fix-orientation-after-unplug into lp:qtmir

fix-orientation-after-unplug
Merge into trunk

Proposed by Gerry Boland on 2016-02-15

Status:

Merged

Approved by:

Michael Zanetti on 2016-02-22

Approved revision:

443

Merged at revision:

456

Proposed branch:

lp:~gerboland/qtmir/fix-orientation-after-unplug

Merge into:

lp:qtmir

Diff against target:

95 lines (+37/-8)

3 files modified

src/platforms/mirserver/screen.cpp (+17/-4)
src/platforms/mirserver/screen.h (+3/-1)
tests/mirserver/Screen/screen_test.cpp (+17/-3)

To merge this branch:

bzr merge lp:~gerboland/qtmir/fix-orientation-after-unplug

Critical

In Progress

Link a bug report

Reviewer	Review Type	Date Requested	Status
Michael Zanetti (community)		2016-02-15	Approve on 2016-02-22
Unity8 CI Bot (community)	continuous-integration		Approve on 2016-02-16
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2016-02-15
Review via email: mp+286065@code.launchpad.net

Commit message

Screen: only enable orientation sensor for internal display.

It's not great, but works around orientation sensor not working after device unplug from monitor. I believe this is because QtUbuntu-Sensors and Platform-api are not dealing properly with multiple accessors of the sensors. Instead only the last accessor gets correct state, and the earlier ones get nothing.

Revision history for this message

Gerry Boland (gerboland) wrote on 2016-02-15:

Logged https://bugs.launchpad.net/qtubuntu-sensors/+bug/1545747

Revision history for this message

Michał Sawicz (saviq) wrote on 2016-02-15:

+TODO?

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-15:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-1-ci/70/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-02-15:

FAILED: Continuous integration, rev:441
http://jenkins.qa.ubuntu.com/job/qtmir-ci/690/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/384/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/386/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/266/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/421/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/423/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/266/console

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

review: Needs Fixing (continuous-integration)

lp:~gerboland/qtmir/fix-orientation-after-unplug updated on 2016-02-15

442. By Gerry Boland on 2016-02-15: Consider eDP connector internal too
443. By Gerry Boland on 2016-02-15: Update test to check both cases

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-15:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-1-ci/71/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-02-15:

FAILED: Continuous integration, rev:443
http://jenkins.qa.ubuntu.com/job/qtmir-ci/691/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/385
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/387
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/387/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/267
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/422/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/424/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/267/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-16:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-1-ci/71/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-16:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-1-ci/71/rebuild

review: Approve (continuous-integration)

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2016-02-22:

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

in silo 10, so yes

* Did CI run pass? If not, please explain why.

it did

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

needs tags stripping.

lp:~gerboland/qtmir/fix-orientation-after-unplug: would delete 0.4.7+16.04.20160205-0ubuntu1,0.4.7+16.04.20160121.2-0ubuntu1,0.4.7+16.04.20160126.2-0ubuntu1,0.4.7+16.04.20160204.2-0ubuntu1,0.4.7+16.04.20160204-0ubuntu1,0.4.7+16.04.20160126-0ubuntu1,0.4.7+16.04.20160127-0ubuntu1,0.4.7+16.04.20160121-0ubuntu1,0.4.7+16.04.20160126.1-0ubuntu1,0.4.7+16.04.20160121.1-0ubuntu1,0.4.7+16.04.20160204.1-0ubuntu1

review: Needs Fixing

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2016-02-22:

Tags stripped now. lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Daniel d'Andrada

Gerry Boland

Mir development team

 === modified file 'src/platforms/mirserver/screen.cpp'
 --- src/platforms/mirserver/screen.cpp	2015-10-14 22:59:04 +0000
 +++ src/platforms/mirserver/screen.cpp	2016-02-15 16:02:31 +0000
@@ -135,9 +135,11 @@
              ? Qt::LandscapeOrientation : Qt::PortraitOrientation;
      qCDebug(QTMIR_SENSOR_MESSAGES) << "Screen - initial currentOrientation is:" << m_currentOrientation;
--    QObject::connect(m_orientationSensor, &QOrientationSensor::readingChanged,
--                     this, &Screen::onOrientationReadingChanged);
--    m_orientationSensor->start();
++    if (internalDisplay()) { // only enable orientation sensor for device-internal display
++        QObject::connect(m_orientationSensor, &QOrientationSensor::readingChanged,
++                         this, &Screen::onOrientationReadingChanged);
++        m_orientationSensor->start();
++    }
      if (!skipDBusRegistration) {
          // FIXME This is a unity8 specific dbus call and shouldn't be in qtmir
@@ -171,7 +173,9 @@
  void Screen::onDisplayPowerStateChanged(int status, int reason)
+ {
      Q_UNUSED(reason);
--    toggleSensors(status);
++    if (internalDisplay()) {
++        toggleSensors(status);
++    }
+ }
  void Screen::setMirDisplayConfiguration(const mir::graphics::DisplayConfigurationOutput &screen)
@@ -334,3 +338,12 @@
+ {
      m_renderTarget->release_current();
+ }
++
++bool Screen::internalDisplay() const
++{
++    using namespace mir::graphics;
++    if (m_type == DisplayConfigurationOutputType::lvds || m_type == DisplayConfigurationOutputType::edp) {
++        return true;
++    }
++    return false;
++}
 === modified file 'src/platforms/mirserver/screen.h'
 --- src/platforms/mirserver/screen.h	2015-10-14 22:59:04 +0000
 +++ src/platforms/mirserver/screen.h	2016-02-15 16:02:31 +0000
@@ -53,7 +53,6 @@
      Qt::ScreenOrientation orientation() const override { return m_currentOrientation; }
      QPlatformCursor *cursor() const override;
--    void toggleSensors(const bool enable) const;
      mir::graphics::DisplayConfigurationOutputType outputType() const { return m_type; }
      ScreenWindow* window() const;
@@ -79,6 +78,9 @@
      void doneCurrent();
  private:
++    void toggleSensors(const bool enable) const;
++    bool internalDisplay() const;
++
      QRect m_geometry;
      int m_depth;
      QImage::Format m_format;
 === modified file 'tests/mirserver/Screen/screen_test.cpp'
 --- tests/mirserver/Screen/screen_test.cpp	2015-10-14 22:59:04 +0000
 +++ tests/mirserver/Screen/screen_test.cpp	2016-02-15 16:02:31 +0000
@@ -42,9 +42,23 @@
      Screen::skipDBusRegistration = true;
+ }
--TEST_F(ScreenTest, OrientationSensor)
--{
--    Screen *screen = new Screen(fakeOutput1);
++TEST_F(ScreenTest, OrientationSensorForExternalDisplay)
++{
++    Screen *screen = new Screen(fakeOutput1); // is external display (dvi)
++
++    // Default state should be disabled
++    ASSERT_FALSE(screen->orientationSensorEnabled());
++
++    screen->onDisplayPowerStateChanged(0,0);
++    ASSERT_FALSE(screen->orientationSensorEnabled());
++
++    screen->onDisplayPowerStateChanged(1,0);
++    ASSERT_FALSE(screen->orientationSensorEnabled());
++}
++
++TEST_F(ScreenTest, OrientationSensorForInternalDisplay)
++{
++    Screen *screen = new Screen(fakeOutput2); // is internal display
      // Default state should be active
      ASSERT_TRUE(screen->orientationSensorEnabled());

QtMir

Merge lp:~gerboland/qtmir/fix-orientation-after-unplug into lp:qtmir

Commit message

Description of the change

Preview Diff

Subscribers