Merge lp://staging/~michael-sheldon/ubuntu-keyboard/visual-refresh into lp://staging/ubuntu-keyboard
Proposed by
Michael Sheldon
Status: | Merged |
---|---|
Approved by: | Bill Filler |
Approved revision: | no longer in the source branch. |
Merged at revision: | 442 |
Proposed branch: | lp://staging/~michael-sheldon/ubuntu-keyboard/visual-refresh |
Merge into: | lp://staging/ubuntu-keyboard |
Diff against target: |
3229 lines (+1006/-358) 150 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 (+1/-1) 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 (+1/-1) 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 (+1/-1) plugins/ca/qml/Keyboard_ca_email.qml (+1/-1) plugins/ca/qml/Keyboard_ca_url.qml (+1/-1) plugins/ca/qml/Keyboard_ca_url_search.qml (+1/-1) plugins/cs/qml/Keyboard_cs.qml (+1/-1) 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 (+1/-1) 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 (+1/-1) 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/el/qml/Keyboard_el.qml (+1/-1) plugins/el/qml/Keyboard_el_email.qml (+1/-1) plugins/el/qml/Keyboard_el_url.qml (+1/-1) plugins/el/qml/Keyboard_el_url_search.qml (+1/-1) plugins/emoji/qml/Keyboard_emoji.qml (+1/-1) plugins/en/qml/Keyboard_en.qml (+1/-1) 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 (+1/-1) 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 (+1/-1) plugins/fi/qml/Keyboard_fi_email.qml (+1/-1) plugins/fi/qml/Keyboard_fi_url.qml (+1/-1) plugins/fi/qml/Keyboard_fi_url_search.qml (+1/-1) plugins/fr/qml/Keyboard_fr.qml (+1/-1) 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/gd/qml/Keyboard_gd.qml (+1/-1) plugins/gd/qml/Keyboard_gd_email.qml (+1/-1) plugins/gd/qml/Keyboard_gd_url.qml (+1/-1) plugins/gd/qml/Keyboard_gd_url_search.qml (+1/-1) plugins/he/qml/Keyboard_he.qml (+1/-1) 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 (+1/-1) 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 (+1/-1) 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/is/qml/Keyboard_is.qml (+1/-1) plugins/is/qml/Keyboard_is_email.qml (+1/-1) plugins/is/qml/Keyboard_is_url.qml (+1/-1) plugins/is/qml/Keyboard_is_url_search.qml (+1/-1) plugins/it/qml/Keyboard_it.qml (+1/-1) 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/nb/qml/Keyboard_nb.qml (+1/-1) plugins/nb/qml/Keyboard_nb_email.qml (+1/-1) plugins/nb/qml/Keyboard_nb_url.qml (+1/-1) plugins/nb/qml/Keyboard_nb_url_search.qml (+1/-1) plugins/nl/qml/Keyboard_nl.qml (+1/-1) 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/pinyin/qml/Keyboard_zh.qml (+1/-1) plugins/pinyin/qml/Keyboard_zh_email.qml (+1/-1) plugins/pinyin/qml/Keyboard_zh_url.qml (+1/-1) plugins/pinyin/qml/Keyboard_zh_url_search.qml (+1/-1) plugins/pl/qml/Keyboard_pl.qml (+1/-1) 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 (+1/-1) 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/ro/qml/Keyboard_ro.qml (+1/-1) plugins/ro/qml/Keyboard_ro_email.qml (+1/-1) plugins/ro/qml/Keyboard_ro_url.qml (+1/-1) plugins/ro/qml/Keyboard_ro_url_search.qml (+1/-1) plugins/ru/qml/Keyboard_ru.qml (+1/-1) 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/sl/qml/Keyboard_sl.qml (+1/-1) plugins/sl/qml/Keyboard_sl_email.qml (+1/-1) plugins/sl/qml/Keyboard_sl_url.qml (+1/-1) plugins/sl/qml/Keyboard_sl_url_search.qml (+1/-1) plugins/sr/qml/Keyboard_sr.qml (+1/-1) 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 (+1/-1) 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) plugins/uk/qml/Keyboard_uk.qml (+1/-1) plugins/uk/qml/Keyboard_uk_email.qml (+1/-1) plugins/uk/qml/Keyboard_uk_url.qml (+1/-1) plugins/uk/qml/Keyboard_uk_url_search.qml (+1/-1) qml/Keyboard.qml (+23/-10) qml/KeyboardContainer.qml (+1/-1) qml/WordRibbon.qml (+9/-9) qml/images/keyboard-caps-disabled.svg (+180/-0) qml/images/keyboard-caps-enabled.svg (+181/-0) qml/images/keyboard-caps-locked.svg (+186/-0) qml/keys/ActionKey.qml (+20/-11) qml/keys/BackspaceKey.qml (+1/-1) qml/keys/CharKey.qml (+26/-23) qml/keys/DropShadow.qml (+1/-1) qml/keys/ExtendedKeysSelector.qml (+2/-4) qml/keys/KeyPad.qml (+1/-1) qml/keys/LanguageKey.qml (+1/-1) qml/keys/LanguageMenu.qml (+3/-39) qml/keys/Magnifier.qml (+2/-2) qml/keys/OneTwoKey.qml (+1/-4) qml/keys/PressArea.qml (+1/-1) qml/keys/ReturnKey.qml (+2/-4) qml/keys/ShiftKey.qml (+5/-6) qml/keys/SmallSpaceKey.qml (+34/-0) qml/keys/SpaceKey.qml (+15/-3) qml/keys/Spacer.qml (+1/-1) qml/keys/SymbolShiftKey.qml (+1/-3) qml/keys/UrlKey.qml (+1/-2) qml/keys/key_constants.js (+38/-23) qml/keys/languages.js (+52/-0) qml/languages/Keyboard_numbers.qml (+48/-43) qml/languages/Keyboard_symbols.qml (+1/-1) qml/languages/Keyboard_telephone.qml (+48/-43) qml/qml.pro (+1/-1) tests/autopilot/ubuntu_keyboard/emulators/keyboard.py (+1/-1) tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py (+1/-1) tests/testlayout/qml/Keyboard_testlayout.qml (+1/-1) |
To merge this branch: | bzr merge lp://staging/~michael-sheldon/ubuntu-keyboard/visual-refresh |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Needs Fixing | |
Ubuntu Phablet Team | Pending | ||
Review via email:
|
Commit message
Update keyboard visuals to match new design spec
Description of the change
Update keyboard visuals to match new design spec
To post a comment you must log in.
FAILED: Continuous integration, rev:437 jenkins. qa.ubuntu. com/job/ ubuntu- keyboard- ci/648/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- vivid-touch/ 6117/console jenkins. qa.ubuntu. com/job/ ubuntu- keyboard- vivid-amd64- ci/147/ console jenkins. qa.ubuntu. com/job/ ubuntu- keyboard- vivid-armhf- ci/148/ console jenkins. qa.ubuntu. com/job/ ubuntu- keyboard- vivid-i386- ci/147/ console jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 6128/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/ubuntu- keyboard- ci/648/ rebuild
http://