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

[Michael Sheldon]

Make user input bold if there aren't any suggestions and expose bold property to autopilot

Make user input bold if there aren't any suggestions and expose bold property to autopilot

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:432
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/643/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5879
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/143
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/143
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/143/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/143
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4536
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5890
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5890/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26291

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

review: Approve (continuous-integration)

[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

=== modified file 'qml/WordRibbon.qml'
--- qml/WordRibbon.qml	2014-08-18 12:00:08 +0000
+++ qml/WordRibbon.qml	2015-12-21 11:48:29 +0000
@@ -48,6 +48,7 @@
             height: wordRibbonCanvas.height
             anchors.margins: 0
             property alias word_text: wordItem // For testing in Autopilot
+            property alias textBold: wordItem.font.bold // Exposed for autopilot
 
             Item {
                 anchors.fill: parent
@@ -63,7 +64,7 @@
                     font.pixelSize: units.gu(1.9)
                     font.family: "Ubuntu Medium"
                     color: "#999999"
-                    font.bold: isPrimaryCandidate
+                    font.bold: isPrimaryCandidate || listView.count == 1
                     text: word;
                     anchors.centerIn: parent
                 }