lp:~nick-dedekind/unity8/mirCompositor-appMocks

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~unity-team/unity8/mirCompositor at revision 1067

Daniel d'Andrada (community): Approve on 2014-07-18

Diff: 692 lines (+299/-48)

10 files modified

tests/mocks/Unity/Application/ApplicationInfo.cpp (+60/-22)
tests/mocks/Unity/Application/ApplicationInfo.h (+21/-8)
tests/mocks/Unity/Application/ApplicationManager.cpp (+31/-18)
tests/mocks/Unity/Application/ApplicationManager.h (+6/-0)
tests/mocks/Unity/Application/CMakeLists.txt (+2/-0)
tests/mocks/Unity/Application/MirSurfaceItem.cpp (+40/-0)
tests/mocks/Unity/Application/MirSurfaceItem.h (+84/-0)
tests/mocks/Unity/Application/SurfaceManager.cpp (+16/-0)
tests/mocks/Unity/Application/SurfaceManager.h (+26/-0)
tests/mocks/Unity/Application/plugin.cpp (+13/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1061. By Nick Dedekind on 2014-07-18

whitespace

1060. By Nick Dedekind on 2014-07-18

removed qdebug

1059. By Nick Dedekind on 2014-07-18

render screenshot directly on surface

1058. By Nick Dedekind on 2014-07-18

remove screenshot update

1057. By Nick Dedekind on 2014-07-18

mocks for qtmir

1056. By Michael Zanetti on 2014-07-18

fix typo

1055. By Daniel d'Andrada on 2014-07-17

Shell.qml: Move the new Key event handlers to WindowKeysFilter

As Shell itself no longer gets focus

1054. By Daniel d'Andrada on 2014-07-17

Merge trunk

[ Michał Sawicz ]
* Only generate .qmltypes files manually, no need to do it build-time.
  It didn't work when cross-compiling either, and required builders to
  have otherwise unnecessary environment.
* Fix CardCreator test. It got broken with a merge that got landed
  along side of it.
[ Ying-Chun Liu ]
* Add reboot/shutdown (LP: #1234062)
[ Albert Astals ]
* Make the departments test more stable
[ Mirco Müller ]
* Fixes gap at top of sim-unlock/fullscreen notification (point 1.),
  fixes blocking overlay if underlying UnityMenuModel vanishes from
  DBus (point 2.). The third bullet-point of the bug-report, lockup of
  shell-UI, could not be reproduced. (LP: #1308011)
[ Michael Terry ]
* Expose a new greeter DBus property, IsActive, which tells apps and
  indicators when the integrated-greeter screen is active. Useful for
  switching UI modes when the screen is locked.
* Allow the session to bring up the greeter/lockscreen over DBus. The
  emergency dialer will need this support in order to cancel bringing
  it up.
[ Michael Zanetti ]
* Fixes gap at top of sim-unlock/fullscreen notification (point 1.),
  fixes blocking overlay if underlying UnityMenuModel vanishes from
  DBus (point 2.). The third bullet-point of the bug-report, lockup of
  shell-UI, could not be reproduced. (LP: #1308011)

1053. By Daniel d'Andrada on 2014-07-17

Fix keys handling and the focus mayhem

1052. By Michael Zanetti on 2014-07-17

re-focus previously focused app after greeter