Merge lp:~michael-sheldon/ubuntu-keyboard/fix-autocaps-on-delete into lp:ubuntu-keyboard

[Michael Sheldon]

Disable autocaps when the user deletes beyond a full stop character.

Disable autocaps when the user deletes beyond a full stop character.

[Michael Sheldon (michael-sheldon)]

Are there any related MPs required for this MP to build/function as expected? Please list.

 * No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

 * Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/ubuntu-keyboard) on device or emulator?

 * Yes

If you changed the UI, was the change specified/approved by design?

 * No change

If you changed UI labels, did you update the pot file?

 * No change

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?

 * No change

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:230
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/473/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-amd64-ci/99
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/98
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/98/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-i386-ci/98

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

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?
yes

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

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
yes

review: Approve

=== modified file 'qml/keys/CharKey.qml'
--- qml/keys/CharKey.qml	2014-09-16 12:39:01 +0000
+++ qml/keys/CharKey.qml	2014-09-25 15:25:14 +0000
@@ -209,7 +209,7 @@
                     magnifier.shown = false;
                 }
 
-                if (panel.autoCapsTriggered) {
+                if (panel.autoCapsTriggered && action != "backspace") {
                     panel.autoCapsTriggered = false;
                 }
                 else if (!skipAutoCaps) {
@@ -243,7 +243,9 @@
                  pressEffect.start();
 
             // Quick workaround to fix initial autocaps - not beautiful, but works
-            panel.autoCapsTriggered = false;
+            if(action != "backspace") {
+                panel.autoCapsTriggered = false;
+            }
             event_handler.onKeyPressed(valueToSubmit, action);
         }
 

=== modified file 'src/plugin/inputmethod.cpp'
--- src/plugin/inputmethod.cpp	2014-09-10 14:57:52 +0000
+++ src/plugin/inputmethod.cpp	2014-09-25 15:25:14 +0000
@@ -422,9 +422,10 @@
         QString text;
         int position;
         bool ok = d->host->surroundingText(text, position);
+        QString textOnLeft = (d->editor.text()->surroundingLeft() + d->editor.text()->preedit()).trimmed();
         if (ok && text.isEmpty() && d->editor.text()->preedit().isEmpty() && position == 0) {
             Q_EMIT activateAutocaps();
-        } else {
+        } else if (!d->editor.wordEngine()->languageFeature()->activateAutoCaps(textOnLeft)) {
             // Clear autocaps if it has been set by us previously being in an
             // empty field
             Q_EMIT deactivateAutocaps();

=== modified file 'src/view/abstracttexteditor.cpp'
--- src/view/abstracttexteditor.cpp	2014-09-22 12:43:09 +0000
+++ src/view/abstracttexteditor.cpp	2014-09-25 15:25:14 +0000
@@ -938,7 +938,7 @@
     if (d->auto_caps_enabled) {
         if (auto_caps_activated) {
             Q_EMIT autoCapsActivated();
-        } else {
+        } else if(!textOnLeft.isEmpty()) {
             Q_EMIT autoCapsDeactivated();
         }
     }