ubuntu-keyboard

Merge lp:~schwann/ubuntu-keyboard/keyboard-decoupled-autocaps into lp:ubuntu-keyboard

  1. keyboard-decoupled-autocaps
  2. Merge into trunk
Proposed by Günter Schwann
Status: Merged
Approved by: Thomas Moenicke
Approved revision: 85
Merged at revision: 89
Proposed branch: lp:~schwann/ubuntu-keyboard/keyboard-decoupled-autocaps
Merge into: lp:ubuntu-keyboard
Diff against target: 13 lines (+2/-1)
1 file modified
src/view/abstracttexteditor.cpp (+2/-1)
To merge this branch: bzr merge lp:~schwann/ubuntu-keyboard/keyboard-decoupled-autocaps
Reviewer Review Type Date Requested Status
Thomas Moenicke (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+192492@code.launchpad.net

Commit message

Decouple autocaps from predictive text fixes LP: #1214695

Description of the change

Decouple autocaps from predictive text fixes LP: #1214695

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:85
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/187/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/15/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/15

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-keyboard-ci/187/rebuild

review: Approve (continuous-integration)
Revision history for this message
Thomas Moenicke (thomas-moenicke) wrote :

tested on device: autocaps still working when disabled wordeninge this way:
gsettings set com.canonical.keyboard.maliit predictive-text false

Revision history for this message
Thomas Moenicke (thomas-moenicke) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/view/abstracttexteditor.cpp'
2--- src/view/abstracttexteditor.cpp 2013-10-24 07:14:52 +0000
3+++ src/view/abstracttexteditor.cpp 2013-10-24 12:14:06 +0000
4@@ -448,7 +448,8 @@
5 } break;
6
7 case Key::ActionSpace: {
8- const bool auto_caps_activated = d->language_features->activateAutoCaps(d->text->preedit());
9+ QString textOnLeft = d->text->surroundingLeft() + d->text->preedit();
10+ const bool auto_caps_activated = d->language_features->activateAutoCaps(textOnLeft);
11 const bool replace_preedit = d->auto_correct_enabled && not d->text->primaryCandidate().isEmpty();
12
13 if (replace_preedit) {

Subscribers

People subscribed via source and target branches