ubuntu-keyboard

Merge lp://qastaging/~michael-sheldon/ubuntu-keyboard/emojione-improvements into lp://qastaging/ubuntu-keyboard

  1. emojione-improvements
  2. Merge into trunk
Proposed by Michael Sheldon
Status: Merged
Approved by: Bill Filler
Approved revision: 489
Merged at revision: 498
Proposed branch: lp://qastaging/~michael-sheldon/ubuntu-keyboard/emojione-improvements
Merge into: lp://qastaging/ubuntu-keyboard
Diff against target: 855 lines (+389/-249)
10 files modified
plugins/emoji/qml/CategoryKey.qml (+39/-0)
plugins/emoji/qml/Keyboard_emoji.qml (+290/-160)
plugins/emoji/qml/emoji.js (+1/-57)
qml/Keyboard.qml (+6/-8)
qml/KeyboardContainer.qml (+0/-1)
qml/keys/CharKey.qml (+8/-4)
qml/keys/KeyPad.qml (+15/-5)
qml/keys/KeyPopover.qml (+10/-7)
qml/keys/PressArea.qml (+8/-6)
tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py (+12/-1)
To merge this branch: bzr merge lp://qastaging/~michael-sheldon/ubuntu-keyboard/emojione-improvements
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+299193@code.qastaging.launchpad.net

Commit message

Switch to scrollable GridView for Emoji layout
Add support for all the Emoji One characters and categories
Add support for skin tones
Add category for recently used emoji

Description of the change

Switch to scrollable GridView for Emoji layout
Add support for all the Emoji One characters and categories
Add support for skin tones
Add category for recently used emoji

To post a comment you must log in.
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:489
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-keyboard-ci/28/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1118/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1118
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/1013
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/1013
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/1013
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1002
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1002/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1002
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1002/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1002/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1002
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1002/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1002
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1002/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1002/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1002
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1002/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1002
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1002/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1002/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-keyboard-ci/28/rebuild

review: Needs Fixing (continuous-integration)
lp://qastaging/~michael-sheldon/ubuntu-keyboard/emojione-improvements updated
490. By Michael Sheldon

Merge from trunk

491. By Michael Sheldon

Update emoji autopilot tests

492. By Michael Sheldon

Show more emoji in landscape mode

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:491
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-keyboard-ci/29/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1123/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1123
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/1018
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/1018
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/1018
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1007
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1007/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1007
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1007/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1007/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1007
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1007/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1007
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1007/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1007/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1007
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1007/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1007
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1007/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1007/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-keyboard-ci/29/rebuild

review: Needs Fixing (continuous-integration)
lp://qastaging/~michael-sheldon/ubuntu-keyboard/emojione-improvements updated
493. By Michael Sheldon

Reduce cacheBuffer to 30gu for smoother scrolling and reduced memory usage

494. By Michael Sheldon

Keep single font size for emoji, but display more emoji per screen on tablets

495. By Michael Sheldon

Control emoji loaders based on gridview movement

496. By Michael Sheldon

Reduce number of emoji in tablet layout to allow for easier key presses

497. By Michael Sheldon

Fix tablet spacing on emoji layout

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