lp:~charlesk/indicator-display/lp-1572545-prompt-in-lockscreen

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:indicator-display at revision 21

unity-api-1-bot: Needs Fixing (continuous-integration) on 2016-09-22

Charles Kerr: Pending requested 2016-09-22

Antti Kaijanmäki: Pending requested 2016-09-22

PS Jenkins bot: Pending (continuous-integration) requested 2016-09-22

Diff: 867 lines (+446/-155)

12 files modified

src/greeter.cpp (+130/-81)
src/greeter.h (+8/-2)
src/usb-manager.cpp (+59/-46)
src/usb-snap.cpp (+1/-0)
tests/integration/usb-manager-test.cpp (+11/-5)
tests/unit/CMakeLists.txt (+5/-0)
tests/unit/greeter-test.cpp (+159/-0)
tests/unit/usb-snap-test.cpp (+3/-8)
tests/utils/adbd-server.h (+9/-11)
tests/utils/gtest-print-helpers.h (+18/-0)
tests/utils/mock-greeter.h (+2/-2)
tests/utils/mock-unity-greeter.py (+41/-0)

api

Superseded for merging into lp:indicator-display/15.10

Charles Kerr (community): Approve on 2016-04-27

Antti Kaijanmäki (community): Approve on 2016-04-27

PS Jenkins bot (community): Needs Fixing (continuous-integration) on 2016-04-21

Diff: 867 lines (+446/-155)

12 files modified

src/greeter.cpp (+130/-81)
src/greeter.h (+8/-2)
src/usb-manager.cpp (+59/-46)
src/usb-snap.cpp (+1/-0)
tests/integration/usb-manager-test.cpp (+11/-5)
tests/unit/CMakeLists.txt (+5/-0)
tests/unit/greeter-test.cpp (+159/-0)
tests/unit/usb-snap-test.cpp (+3/-8)
tests/utils/adbd-server.h (+9/-11)
tests/utils/gtest-print-helpers.h (+18/-0)
tests/utils/mock-greeter.h (+2/-2)
tests/utils/mock-unity-greeter.py (+41/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

41. By Charles Kerr on 2016-05-03

sync UsbManagerFixture::USBDisconnectedDuringPrompt to r40, to expect a 'no' each time there's a usb disconnect

40. By Charles Kerr on 2016-05-03

always send a response to adb even in edge cases; e.g. send an auto-NO if the usb connection is broken while the prompt is up

39. By Charles Kerr on 2016-04-29

don't clear the snap decision when the greeter changes state

38. By Charles Kerr on 2016-04-27

increase timeout interval on usb manager integration test

37. By Charles Kerr on 2016-04-27

fix two trivial 'unused parameter' warnings in glib callbacks

36. By Charles Kerr on 2016-04-27

remove the temporary tracers

35. By Charles Kerr on 2016-04-27

sync tests to r33 changes

34. By Charles Kerr on 2016-04-27

silence 'no previous prototype' warning from clang

33. By Charles Kerr on 2016-04-27

choosing an action in the snap decision closes the notification, so when that happens clear our notification_id s.t. our dtor doesn't try to remove a notification that no longer exists

32. By Charles Kerr on 2016-04-27

silence clang warning in PrintTo gtest helper