Merge lp:~michael-sheldon/ubuntu-keyboard/fix-1448145 into lp:ubuntu-keyboard

[Michael Sheldon]

Don't send preedit events when preedit is disabled

Don't send preedit events when preedit is disabled

[system-apps-ci-bot (system-apps-ci-bot)]

PASSED: Continuous integration, rev:475
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-keyboard-ci/7/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/539
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/54
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/539
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/527
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/527
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/523
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/523/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/523
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/523/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/523
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/523/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/523
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/523/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/523
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/523/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/523
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/523/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-keyboard-ci/7/rebuild

review: Approve (continuous-integration)

[lp:~michael-sheldon/ubuntu-keyboard/fix-1448145]

476. By Michael Sheldon on 2016-06-14

Add test for double caps in oxide

477. By Michael Sheldon on 2016-06-14

Fix flake8

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:476
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-keyboard-ci/16/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/586/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/586
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/566
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/566
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/560/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/560/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/560/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/560/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/560/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/560/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-keyboard-ci/16/rebuild

review: Needs Fixing (continuous-integration)

[system-apps-ci-bot (system-apps-ci-bot)]

PASSED: Continuous integration, rev:477
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-keyboard-ci/18/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/588
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/72
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/588
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/567
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/567
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/561
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/561/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/561
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/561/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/561
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/561/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/561
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/561/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/561
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/561/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/561
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/561/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-keyboard-ci/18/rebuild

review: Approve (continuous-integration)

=== modified file 'src/view/abstracttexteditor.cpp'
--- src/view/abstracttexteditor.cpp	2016-04-27 23:37:27 +0000
+++ src/view/abstracttexteditor.cpp	2016-06-14 15:13:53 +0000
@@ -428,7 +428,7 @@
                 d->word_engine->computeCandidates(d->text.data());
             }
 
-            if (!d->word_engine->languageFeature()->showPrimaryInPreedit()) {
+            if (!d->word_engine->languageFeature()->showPrimaryInPreedit() && d->preedit_enabled) {
                 sendPreeditString(d->text->preedit(), d->text->preeditFace(),
                                   Replacement(d->text->cursorPosition()));
             }
@@ -535,10 +535,8 @@
 
         if (d->word_engine->languageFeature()->commitOnSpace() || full_stop_inserted) {
             commitPreedit();
-        } else {
-            if (d->preedit_enabled) {
-                d->word_engine->computeCandidates(d->text.data());
-            }
+        } else if (d->preedit_enabled) {
+            d->word_engine->computeCandidates(d->text.data());
 
             sendPreeditString(d->text->preedit(), d->text->preeditFace(),
                               Replacement(d->text->cursorPosition()));

=== modified file 'tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py'
--- tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py	2016-04-28 00:42:26 +0000
+++ tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py	2016-06-14 15:13:53 +0000
@@ -1359,6 +1359,55 @@
             Eventually(Equals(False))
         )
 
+    def test_double_caps(self):
+        """Ensure that we switch back to lowercase after typing a letter in
+        Oxide.
+
+        """
+        qml = dedent("""
+        import QtQuick 2.4
+        import Ubuntu.Components 1.3
+        import Ubuntu.Web 0.2
+
+        Rectangle {
+            id: window
+            objectName: "windowRectangle"
+            color: "lightgrey"
+
+            WebView {
+                anchors.fill: parent
+                objectName: "webview"
+                Component.onCompleted: {
+                    loadHtml("
+                        <html><body><textarea id='textarea'
+                        style='width: 100%; height: 100%;'></textarea>
+                        </body></html>"
+                    );
+                }
+            }
+        }
+
+        """)
+        gsettings = Gio.Settings.new("com.canonical.keyboard.maliit")
+        gsettings.set_boolean("auto-capitalization", True)
+        gsettings.set_boolean("auto-completion", False)
+        gsettings.set_boolean("predictive-text", False)
+        gsettings.set_boolean("spell-checking", False)
+
+        app = self._start_qml_script(qml)
+        webview = app.select_single(objectName='webview')
+
+        self.ensure_focus_on_input(webview)
+        keyboard = Keyboard()
+        self.addCleanup(keyboard.dismiss)
+
+        keyboard.type('H')
+
+        self.assertThat(
+            keyboard.active_keypad_state,
+            Eventually(Equals(KeyPadState.NORMAL))
+        )
+
 
 class UbuntuKeyboardPluginPaths(UbuntuKeyboardTests):