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

Proposed by Michael Sheldon
Status: Needs review
Proposed branch: lp://staging/~michael-sheldon/ubuntu-keyboard/fix-1421411
Merge into: lp://staging/ubuntu-keyboard
Prerequisite: lp://staging/~michael-sheldon/ubuntu-keyboard/fix-extended-key-ordering
Diff against target: 1232 lines (+159/-105)
82 files modified
plugins/ar/qml/Keyboard_ar.qml (+1/-1)
plugins/ar/qml/Keyboard_ar_email.qml (+1/-1)
plugins/ar/qml/Keyboard_ar_url.qml (+1/-1)
plugins/ar/qml/Keyboard_ar_url_search.qml (+1/-1)
plugins/az/qml/Keyboard_az.qml (+2/-2)
plugins/az/qml/Keyboard_az_email.qml (+1/-1)
plugins/az/qml/Keyboard_az_url.qml (+1/-1)
plugins/az/qml/Keyboard_az_url_search.qml (+1/-1)
plugins/bs/qml/Keyboard_bs.qml (+2/-2)
plugins/bs/qml/Keyboard_bs_email.qml (+1/-1)
plugins/bs/qml/Keyboard_bs_url.qml (+1/-1)
plugins/bs/qml/Keyboard_bs_url_search.qml (+1/-1)
plugins/ca/qml/Keyboard_ca.qml (+2/-2)
plugins/ca/qml/Keyboard_ca_email.qml (+1/-1)
plugins/ca/qml/Keyboard_ca_url.qml (+1/-1)
plugins/cs/qml/Keyboard_cs.qml (+2/-2)
plugins/cs/qml/Keyboard_cs_email.qml (+1/-1)
plugins/cs/qml/Keyboard_cs_url.qml (+1/-1)
plugins/cs/qml/Keyboard_cs_url_search.qml (+1/-1)
plugins/da/qml/Keyboard_da.qml (+2/-2)
plugins/da/qml/Keyboard_da_email.qml (+1/-1)
plugins/da/qml/Keyboard_da_url.qml (+1/-1)
plugins/da/qml/Keyboard_da_url_search.qml (+1/-1)
plugins/de/qml/Keyboard_de.qml (+2/-2)
plugins/de/qml/Keyboard_de_email.qml (+1/-1)
plugins/de/qml/Keyboard_de_url.qml (+1/-1)
plugins/de/qml/Keyboard_de_url_search.qml (+1/-1)
plugins/en/qml/Keyboard_en.qml (+2/-2)
plugins/en/qml/Keyboard_en_email.qml (+1/-1)
plugins/en/qml/Keyboard_en_url.qml (+1/-1)
plugins/en/qml/Keyboard_en_url_search.qml (+1/-1)
plugins/es/qml/Keyboard_es.qml (+2/-2)
plugins/es/qml/Keyboard_es_email.qml (+1/-1)
plugins/es/qml/Keyboard_es_url.qml (+1/-1)
plugins/es/qml/Keyboard_es_url_search.qml (+1/-1)
plugins/fi/qml/Keyboard_fi.qml (+2/-2)
plugins/fr/qml/Keyboard_fr.qml (+2/-2)
plugins/fr/qml/Keyboard_fr_email.qml (+1/-1)
plugins/fr/qml/Keyboard_fr_url.qml (+1/-1)
plugins/fr/qml/Keyboard_fr_url_search.qml (+1/-1)
plugins/he/qml/Keyboard_he.qml (+2/-2)
plugins/he/qml/Keyboard_he_email.qml (+1/-1)
plugins/he/qml/Keyboard_he_url.qml (+1/-1)
plugins/he/qml/Keyboard_he_url_search.qml (+1/-1)
plugins/hr/qml/Keyboard_hr.qml (+2/-2)
plugins/hr/qml/Keyboard_hr_email.qml (+1/-1)
plugins/hr/qml/Keyboard_hr_url.qml (+1/-1)
plugins/hr/qml/Keyboard_hr_url_search.qml (+1/-1)
plugins/hu/qml/Keyboard_hu.qml (+2/-2)
plugins/hu/qml/Keyboard_hu_email.qml (+1/-1)
plugins/hu/qml/Keyboard_hu_url.qml (+1/-1)
plugins/hu/qml/Keyboard_hu_url_search.qml (+1/-1)
plugins/it/qml/Keyboard_it.qml (+2/-2)
plugins/it/qml/Keyboard_it_email.qml (+1/-1)
plugins/it/qml/Keyboard_it_url.qml (+1/-1)
plugins/it/qml/Keyboard_it_url_search.qml (+1/-1)
plugins/nl/qml/Keyboard_nl.qml (+2/-2)
plugins/nl/qml/Keyboard_nl_email.qml (+1/-1)
plugins/nl/qml/Keyboard_nl_url.qml (+1/-1)
plugins/nl/qml/Keyboard_nl_url_search.qml (+1/-1)
plugins/pl/qml/Keyboard_pl.qml (+2/-2)
plugins/pl/qml/Keyboard_pl_email.qml (+1/-1)
plugins/pl/qml/Keyboard_pl_url.qml (+1/-1)
plugins/pl/qml/Keyboard_pl_url_search.qml (+1/-1)
plugins/pt/qml/Keyboard_pt.qml (+2/-2)
plugins/pt/qml/Keyboard_pt_email.qml (+1/-1)
plugins/pt/qml/Keyboard_pt_url.qml (+1/-1)
plugins/pt/qml/Keyboard_pt_url_search.qml (+1/-1)
plugins/ru/qml/Keyboard_ru.qml (+2/-2)
plugins/ru/qml/Keyboard_ru_email.qml (+1/-1)
plugins/ru/qml/Keyboard_ru_url.qml (+1/-1)
plugins/ru/qml/Keyboard_ru_url_search.qml (+1/-1)
plugins/sr/qml/Keyboard_sr.qml (+2/-2)
plugins/sr/qml/Keyboard_sr_email.qml (+1/-1)
plugins/sr/qml/Keyboard_sr_url.qml (+1/-1)
plugins/sr/qml/Keyboard_sr_url_search.qml (+1/-1)
plugins/sv/qml/Keyboard_sv.qml (+2/-2)
plugins/sv/qml/Keyboard_sv_email.qml (+1/-1)
plugins/sv/qml/Keyboard_sv_url.qml (+1/-1)
plugins/sv/qml/Keyboard_sv_url_search.qml (+1/-1)
tests/autopilot/ubuntu_keyboard/emulators/keyboard.py (+15/-2)
tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py (+44/-3)
To merge this branch: bzr merge lp://staging/~michael-sheldon/ubuntu-keyboard/fix-1421411
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Needs Fixing
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+252583@code.staging.launchpad.net

This proposal supersedes a proposal from 2015-02-16.

Commit message

Add punctuation to extended keys and make comma key more consistent across shift states

Description of the change

Add punctuation to extended keys and make comma key more consistent across shift states

To post a comment you must log in.
Revision history for this message
Michael Sheldon (michael-sheldon) wrote : Posted in a previous version of this proposal

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

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)
Revision history for this message
Bill Filler (bfiller) wrote : Posted in a previous version of this proposal

going to hold off landing this until we fix the issue with the extended keys being shifted by Qt5.4 as it makes it quite apparent with these extra keys

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
324. By Michael Sheldon

Fix extended key sliding tests across different devices

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :
review: Needs Fixing (continuous-integration)

Unmerged revisions

324. By Michael Sheldon

Fix extended key sliding tests across different devices

323. By Michael Sheldon

Add tests for additional punctuation on extended keys (and sliding through extended keys in general)

322. By Michael Sheldon

Merge fix-extended-key-ordering branch

321. By Michael Sheldon

Merge from trunk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches