lp://qastaging/~unity-team/unity8/shell_chrome

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/unity8 at revision 2288

Daniel d'Andrada (community): Needs Information on 2016-03-17

Gerry Boland (community): Approve on 2016-03-16

Unity8 CI Bot: Needs Fixing (continuous-integration) on 2016-03-15

PS Jenkins bot: Pending (continuous-integration) requested 2016-03-11

Michał Sawicz: Pending requested 2016-03-11

Diff: 862 lines (+367/-28)

20 files modified

qml/Components/InputMethod.qml (+4/-1)
qml/Shell.qml (+5/-1)
qml/Stages/AbstractStage.qml (+2/-0)
qml/Stages/DesktopStage.qml (+71/-12)
qml/Stages/PhoneStage.qml (+10/-0)
qml/Stages/StagedFullscreenPolicy.qml (+58/-0)
qml/Stages/TabletStage.qml (+9/-0)
qml/Stages/WindowResizeArea.qml (+2/-2)
qml/Stages/WindowedFullscreenPolicy.qml (+41/-0)
tests/mocks/Unity/Application/ApplicationInfo.cpp (+21/-3)
tests/mocks/Unity/Application/ApplicationInfo.h (+5/-1)
tests/mocks/Unity/Application/ApplicationManager.cpp (+6/-4)
tests/mocks/Unity/Application/MirSurface.cpp (+16/-0)
tests/mocks/Unity/Application/MirSurface.h (+5/-3)
tests/mocks/Unity/Application/MirSurfaceItem.cpp (+9/-0)
tests/mocks/Unity/Application/MirSurfaceItem.h (+1/-0)
tests/mocks/Unity/Application/Session.cpp (+26/-1)
tests/mocks/Unity/Application/Session.h (+7/-0)
tests/qmltests/Stages/tst_WindowResizeArea.qml (+7/-0)
tests/qmltests/tst_Shell.qml (+62/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1535397: [enhancement] Implement support for window states based on form factor

High

Fix Released

Link a bug report

Related blueprints

2219. By Nick Dedekind on 2016-03-16

test fixes

2218. By Nick Dedekind on 2016-03-16

fixed testWindowResizeArea

2217. By Nick Dedekind on 2016-03-16

use function for loadWindowstate

2216. By Nick Dedekind on 2016-03-16

rebase

2215. By Michael Zanetti on 2016-03-15

fix whitespace

2214. By Michael Zanetti on 2016-03-15

merge with prereq

2213. By Nick Dedekind on 2016-03-15

comment

2212. By Nick Dedekind on 2016-03-15

review fixes

2211. By Nick Dedekind on 2016-03-11

use hidden state

2210. By Nick Dedekind on 2016-03-11

obey chrome changes