lp:~tpeeters/ubuntu-ui-toolkit/revert-ap16

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-ui-toolkit/staging at revision 1646

PS Jenkins bot: Approve (continuous-integration) on 2015-09-22

Tim Peeters: Approve on 2015-09-22

Zoltan Balogh: Approve on 2015-09-22

Diff: 624 lines (+56/-152)

16 files modified

tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_common.py (+1/-6)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py (+3/-5)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_mainview.py (+1/-2)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_ubuntulistview.py (+5/-8)
tests/autopilot/ubuntuuitoolkit/tests/__init__.py (+6/-14)
tests/autopilot/ubuntuuitoolkit/tests/components/test_popover.py (+2/-5)
tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.py (+13/-30)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_actionbar.py (+1/-1)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_dialog.py (+2/-5)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py (+8/-34)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py (+7/-23)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitem.py (+3/-6)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_main_view.py (+0/-2)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_qquicklistview.py (+1/-4)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_sections.py (+1/-1)
tests/autopilot/ubuntuuitoolkit/tests/gallery/test_ubuntulistview.py (+2/-6)

api

Superseded for merging into lp:ubuntu-ui-toolkit

Ubuntu SDK team: Pending requested 2015-09-22

Diff: 2312 lines (+1002/-346)

47 files modified

.bzrignore (+1/-1)
components.api (+6/-0)
debian/control (+13/-1)
debian/ubuntu-ui-toolkit-autopilot.install (+0/-1)
debian/ubuntu-ui-toolkit-tools.install (+1/-0)
examples/ubuntu-ui-toolkit-gallery/gallery (+1/-1)
examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.desktop (+1/-1)
src/Ubuntu/Components/1.0/Icon.qml (+4/-4)
src/Ubuntu/Components/1.2/TextInputPopover.qml (+0/-7)
src/Ubuntu/Components/1.3/PageWrapperUtils.js (+9/-2)
src/Ubuntu/Components/1.3/TextInputPopover.qml (+0/-6)
src/Ubuntu/Components/Popups/1.2/ActionSelectionPopover.qml (+3/-1)
src/Ubuntu/Components/Popups/1.2/PopupBase.qml (+1/-0)
src/Ubuntu/Components/Popups/1.3/ActionSelectionPopover.qml (+3/-1)
src/Ubuntu/Components/Popups/1.3/PopupBase.qml (+1/-0)
src/Ubuntu/Components/Themes/Ambiance/1.3/ListItemStyle.qml (+1/-1)
src/Ubuntu/Components/plugin/plugin.cpp (+2/-0)
src/Ubuntu/Components/plugin/privates/listitemdragarea.cpp (+3/-2)
src/Ubuntu/Components/plugin/sortfiltermodel.cpp (+5/-2)
src/Ubuntu/Components/plugin/ucactionitem.cpp (+61/-36)
src/Ubuntu/Components/plugin/ucactionitem.h (+13/-4)
src/Ubuntu/Components/plugin/uclistitem.cpp (+88/-49)
src/Ubuntu/Components/plugin/uclistitem.h (+0/-1)
src/Ubuntu/Components/plugin/uclistitem_p.h (+3/-7)
src/Ubuntu/Components/plugin/ucviewitemsattached.cpp (+0/-64)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py (+5/-0)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/popups.py (+27/-6)
tests/autopilot/ubuntuuitoolkit/base.py (+2/-3)
tests/autopilot/ubuntuuitoolkit/tests/__init__.py (+1/-2)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_popups.py (+56/-2)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_tabs.TabsTestCase.deprecated_TabBar.1.3.qml (+9/-10)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_tabs.py (+4/-2)
tests/resources/listitems/ListItemTest.qml (+7/-2)
tests/resources/navigation/Blackbox.qml (+48/-0)
tests/tests.pro (+0/-2)
tests/uitk_test_plan.sh (+19/-8)
tests/unit_x11/tst_components/ListItemTestCase.qml (+4/-0)
tests/unit_x11/tst_components/ListItemTestCase13.qml (+14/-0)
tests/unit_x11/tst_components/tst_actionitem.qml (+178/-82)
tests/unit_x11/tst_components/tst_icon.qml (+35/-0)
tests/unit_x11/tst_components/tst_listitem.qml (+14/-14)
tests/unit_x11/tst_components/tst_listitem13.qml (+13/-14)
tests/unit_x11/tst_components/tst_listitem_extras.qml (+136/-4)
tests/unit_x11/tst_components/tst_popover.qml (+33/-0)
tests/unit_x11/tst_components/tst_popover13.qml (+174/-0)
ubuntu-sdk.pro (+1/-1)
ubuntu-ui-toolkit-launcher/ubuntu-ui-toolkit-launcher.pro (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1645. By Tim Peeters on 2015-09-22

revert r1642

1644. By Cris Dywan on 2015-09-22

checkPageHeader mustn't assume OrientationHelper in MainView. Fixes: https://bugs.launchpad.net/bugs/1498412.

Approved by PS Jenkins bot, Zsombor Egri.

1643. By Ken VanDine on 2015-09-21

Don't fail if AppHeader doesn't have a useDeprecatedToolbar property
.

Approved by PS Jenkins bot, Zoltan Balogh, Tim Peeters.

1642. By Omer Akram on 2015-09-21

Update autopilot tests and helpers to work with the new Autopilot 1.6 version.

Approved by Zoltan Balogh, PS Jenkins bot.

1641. By Zsombor Egri on 2015-09-18

ListItem swipe over leading/trailing actions blocked. Fixes: https://bugs.launchpad.net/bugs/1486008, https://bugs.launchpad.net/bugs/1496468, https://bugs.launchpad.net/bugs/1497156.

Approved by PS Jenkins bot, Christian Dywan, Zoltan Balogh.

1640. By Albert Astals Cid on 2015-09-18

Bring back pageComponent.createObject for sync pages

Fixes regression in unity8's unity8.settings_wizard.tests.test_settings_wizard.SkipThroughSettingsWizardTestCase.test_skipping_through_wizard autopilot test.

Approved by Zsombor Egri, PS Jenkins bot.

1639. By Zoltan Balogh on 2015-09-16

Customize the UITK test plan and add silo pinning.

Approved by PS Jenkins bot, Timo Jyrinki.

1638. By Zsombor Egri on 2015-09-16

ActionItem visible and enabled internal bindings not broken when the property values are having new bindings or value assignments. Fixes: https://bugs.launchpad.net/bugs/1495408.

Approved by Zoltan Balogh, PS Jenkins bot.

1637. By Albert Astals Cid on 2015-09-16

Make sure pageWrapper.incubator is set before manually calling incubatorStatusChanged
.

Approved by PS Jenkins bot, Zsombor Egri.

1636. By Cris Dywan on 2015-09-15

Use new launcher path in gallery script and .bzrignore.

Approved by PS Jenkins bot, Tim Peeters, Andrea Bernabei.