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

[Michael Sheldon]

Change extended keys on phone layout to '*#'

Change extended keys on phone layout to '*#'

[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:263
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/521/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/22
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/22/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/22

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

review: Approve (continuous-integration)

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

264. By Michael Sheldon on 2014-12-12

Remove , and ; from the telephone layout's extended keys

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:264
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/524/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/25/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/25

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

review: Approve (continuous-integration)

=== modified file 'qml/languages/Keyboard_telephone.qml'
--- qml/languages/Keyboard_telephone.qml	2014-05-28 11:14:15 +0000
+++ qml/languages/Keyboard_telephone.qml	2014-12-12 17:28:37 +0000
@@ -65,7 +65,7 @@
             anchors.margins: 50;
             spacing: 0
 
-            CharKey { label: "+"; annotation: "+*#"; extended: ["*", "#", "(", ")"]; noMagnifier: true; }
+            CharKey { label: "+"; annotation: "*#"; extended: ["*", "#"]; noMagnifier: true; }
             CharKey { label: "0"; noMagnifier: true; }
             BackspaceKey { padding: 0; }
         }