Merge lp://staging/~fboucault/ubuntu-ui-toolkit/text_input_larger_selection_handle_on_trunk into lp://staging/ubuntu-ui-toolkit
Proposed by
Florian Boucault
Status: | Superseded |
---|---|
Proposed branch: | lp://staging/~fboucault/ubuntu-ui-toolkit/text_input_larger_selection_handle_on_trunk |
Merge into: | lp://staging/ubuntu-ui-toolkit |
Diff against target: |
485 lines (+160/-108) (has conflicts) 10 files modified
modules/Ubuntu/Components/InputHandler.qml (+6/-2) modules/Ubuntu/Components/Popups/Popover.qml (+4/-0) modules/Ubuntu/Components/Popups/PopupBase.qml (+3/-1) modules/Ubuntu/Components/TextArea.qml (+2/-0) modules/Ubuntu/Components/TextCursor.qml (+120/-99) modules/Ubuntu/Components/TextField.qml (+2/-0) modules/Ubuntu/Components/TextInputPopover.qml (+14/-3) modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml (+0/-3) modules/Ubuntu/Components/plugin/ucmousefilters.cpp (+1/-0) push_to_phone.sh (+8/-0) Text conflict in push_to_phone.sh |
To merge this branch: | bzr merge lp://staging/~fboucault/ubuntu-ui-toolkit/text_input_larger_selection_handle_on_trunk |
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Needs Fixing | |
Ubuntu SDK team | Pending | ||
Review via email: mp+240770@code.staging.launchpad.net |
This proposal supersedes a proposal from 2014-10-31.
Commit message
TextField/TextArea: make selection handle's touch area a 4 grid units wide square.
To post a comment you must log in.
FAILED: Continuous integration, rev:1311 jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- ci/1186/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- utopic- touch/6379 jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- utopic- amd64-ci/ 1019/console jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- utopic- armhf-ci/ 1018 jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- utopic- armhf-ci/ 1018/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- utopic- i386-ci/ 1018/console jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- mako/5981 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/7631 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/7631/ artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 15293
http://
Executed test runs:
UNSTABLE: http://
FAILURE: http://
SUCCESS: http://
deb: http://
FAILURE: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/ubuntu- sdk-team- ubuntu- ui-toolkit- staging- ci/1186/ rebuild
http://