Merge lp:~michael-sheldon/ubuntu-keyboard/disable-height-switch into lp:ubuntu-keyboard

[Michael Zanetti]

Allow the keyboard's height reporting to be disabled when the system is in windowed mode.

Allow the keyboard's height reporting to be disabled when the system is in windowed mode.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:328
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/597/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2902
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/98
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/98
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/98/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/98
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2488
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2900
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2900/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20663

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

review: Approve (continuous-integration)

=== modified file 'data/schemas/com.canonical.keyboard.maliit.gschema.xml'
--- data/schemas/com.canonical.keyboard.maliit.gschema.xml	2015-04-13 10:54:12 +0000
+++ data/schemas/com.canonical.keyboard.maliit.gschema.xml	2015-04-24 15:44:18 +0000
@@ -66,6 +66,11 @@
       <description>Never show the keyboard (e.g. because a hardware keyboard has been connected.)</description>
       <default>false</default>
     </key>
+    <key name="disable-height" type="b">
+      <summary>Disable height reporting</summary>
+      <description>Always report a height of 0</description>
+      <default>false</default>
+    </key>
     <key name="plugin-paths" type="as">
       <summary>Plugin paths</summary>
       <description>A list of locations to search for keyboard layout plugins in addition to the keyboard data directory.</description>

=== modified file 'src/plugin/inputmethod.cpp'
--- src/plugin/inputmethod.cpp	2015-04-15 14:03:42 +0000
+++ src/plugin/inputmethod.cpp	2015-04-24 15:44:18 +0000
@@ -109,6 +109,7 @@
     connect(d->editor.wordEngine(), SIGNAL(pluginChanged()), this, SLOT(onWordEnginePluginChanged()));
     connect(this, SIGNAL(keyboardStateChanged(QString)), &d->editor, SLOT(onKeyboardStateChanged(QString)));
     connect(d->m_geometry, SIGNAL(visibleRectChanged()), this, SLOT(onVisibleRectChanged()));
+    connect(&d->m_settings, SIGNAL(disableHeightChanged(bool)), this, SLOT(onVisibleRectChanged()));
     d->registerAudioFeedbackSoundSetting();
     d->registerAudioFeedbackSetting();
     d->registerHapticFeedbackSetting();
@@ -616,6 +617,17 @@
                             qGuiApp->primaryScreen()->primaryOrientation(),
                             d->m_geometry->visibleRect().toRect());
 
+    d->applicationApiWrapper->reportOSKVisible(
+                visibleRect.x(),
+                visibleRect.y(),
+                visibleRect.width(),
+                visibleRect.height()
+                );
+
+    if (d->m_settings.disableHeight()) {
+        visibleRect.setHeight(0);
+    }
+
     inputMethodHost()->setScreenRegion(QRegion(visibleRect));
     inputMethodHost()->setInputMethodArea(visibleRect, d->view);
 
@@ -626,12 +638,6 @@
                 << visibleRect.height()
                 << "> to the app manager.";
 
-    d->applicationApiWrapper->reportOSKVisible(
-                visibleRect.x(),
-                visibleRect.y(),
-                visibleRect.width(),
-                visibleRect.height()
-                );
 }
 
 const QString InputMethod::currentPluginPath() const

=== modified file 'src/plugin/keyboardsettings.cpp'
--- src/plugin/keyboardsettings.cpp	2015-04-15 14:03:42 +0000
+++ src/plugin/keyboardsettings.cpp	2015-04-24 15:44:18 +0000
@@ -46,6 +46,7 @@
 const QLatin1String KEY_PRESS_HAPTIC_FEEDBACK_KEY = QLatin1String("keyPressHapticFeedback");
 const QLatin1String DOUBLE_SPACE_FULL_STOP_KEY = QLatin1String("doubleSpaceFullStop");
 const QLatin1String STAY_HIDDEN_KEY = QLatin1String("stayHidden");
+const QLatin1String DISABLE_HEIGHT_KEY = QLatin1String("disableHeight");
 const QLatin1String PLUGIN_PATHS_KEY = QLatin1String("pluginPaths");
 
 /*!
@@ -199,6 +200,11 @@
     return m_settings->get(PLUGIN_PATHS_KEY).toStringList();
 }
 
+bool KeyboardSettings::disableHeight() const
+{
+    return m_settings->get(DISABLE_HEIGHT_KEY).toBool();
+}
+
 /*!
  * \brief KeyboardSettings::settingUpdated slot to handle changes in the settings backend
  * A specialized signal is emitted for the affected setting
@@ -241,6 +247,10 @@
         return;
     } else if (key == STAY_HIDDEN_KEY) {
         Q_EMIT stayHiddenChanged(stayHidden());
+        return;
+    } else if (key == DISABLE_HEIGHT_KEY) {
+        Q_EMIT disableHeightChanged(disableHeight());
+        return;
     } else if (key == PLUGIN_PATHS_KEY) {
         Q_EMIT pluginPathsChanged(pluginPaths());
     }

=== modified file 'src/plugin/keyboardsettings.h'
--- src/plugin/keyboardsettings.h	2015-04-13 10:54:12 +0000
+++ src/plugin/keyboardsettings.h	2015-04-24 15:44:18 +0000
@@ -57,6 +57,7 @@
     bool keyPressHapticFeedback() const;
     bool doubleSpaceFullStop() const;
     bool stayHidden() const;
+    bool disableHeight() const;
     QStringList pluginPaths() const;
 
 Q_SIGNALS:
@@ -72,6 +73,7 @@
     void keyPressHapticFeedbackChanged(bool);
     void doubleSpaceFullStopChanged(bool);
     void stayHiddenChanged(bool);
+    void disableHeightChanged(bool);
     void pluginPathsChanged(QStringList);
 
 private: