lp:~tpeeters/ubuntu-ui-toolkit/110-headerInput

Branch merges

Propose for merging

No branches dependent on this one.

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

PS Jenkins bot: Approve (continuous-integration) on 2014-07-02

Cris Dywan: Approve on 2014-07-02

Leo Arias (community): Approve (code review of the autopilot tests) on 2014-07-01

Diff: 439 lines (+259/-18)

10 files modified

components.api (+1/-0)
modules/Ubuntu/Components/MainView.qml (+2/-1)
modules/Ubuntu/Components/Page.qdoc (+16/-0)
modules/Ubuntu/Components/Page11.qml (+35/-0)
modules/Ubuntu/Components/PageHeadConfiguration.qml (+23/-1)
modules/Ubuntu/Components/TextField.qml (+1/-1)
modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml (+9/-2)
tests/autopilot/ubuntuuitoolkit/tests/components/test_header.HeaderContentsTestCase.qml (+54/-0)
tests/autopilot/ubuntuuitoolkit/tests/components/test_header.py (+58/-6)
tests/resources/toolbar/header.qml (+60/-7)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1324084: Search/input mode for header

Critical

Fix Released

Link a bug report

Related blueprints

1126. By Tim Peeters on 2014-07-01

merge staging

1125. By Tim Peeters on 2014-06-30

leo's comments

1124. By Tim Peeters on 2014-06-30

clean AP tests

1123. By Tim Peeters on 2014-06-30

update component test

1122. By Tim Peeters on 2014-06-30

clean

1121. By Tim Peeters on 2014-06-30

fixing bindings and adding tests

1120. By Tim Peeters on 2014-06-30

merge prerequisite

1119. By Tim Peeters on 2014-06-30

merge pre-requisite

1118. By Tim Peeters on 2014-06-30

don't update to new API in this MR

1117. By Tim Peeters on 2014-06-30

use new API in example