Merge lp://staging/~azzar1/unity/lockscreen into lp://staging/unity
Status: | Merged |
---|---|
Approved by: | Marco Trevisan (Treviño) |
Approved revision: | no longer in the source branch. |
Merged at revision: | 3703 |
Proposed branch: | lp://staging/~azzar1/unity/lockscreen |
Merge into: | lp://staging/unity |
Diff against target: |
5118 lines (+3653/-167) 80 files modified
CMakeLists.txt (+2/-0) UnityCore/DBusIndicators.cpp (+7/-2) UnityCore/DBusIndicators.h (+5/-1) UnityCore/GnomeSessionManager.cpp (+30/-12) UnityCore/GnomeSessionManager.h (+1/-0) UnityCore/GnomeSessionManagerImpl.h (+1/-0) UnityCore/SessionManager.h (+5/-0) debian/control (+3/-5) hud/HudView.cpp (+0/-2) lockscreen/BackgroundSettings.cpp (+153/-0) lockscreen/BackgroundSettings.h (+55/-0) lockscreen/CMakeLists.txt (+33/-0) lockscreen/CofView.cpp (+41/-0) lockscreen/CofView.h (+42/-0) lockscreen/LockScreenAbstractShield.h (+55/-0) lockscreen/LockScreenController.cpp (+249/-0) lockscreen/LockScreenController.h (+74/-0) lockscreen/LockScreenPanel.cpp (+230/-0) lockscreen/LockScreenPanel.h (+75/-0) lockscreen/LockScreenSettings.cpp (+104/-0) lockscreen/LockScreenSettings.h (+66/-0) lockscreen/LockScreenShield.cpp (+200/-0) lockscreen/LockScreenShield.h (+63/-0) lockscreen/LockScreenShieldFactory.cpp (+34/-0) lockscreen/LockScreenShieldFactory.h (+51/-0) lockscreen/UserAuthenticator.h (+56/-0) lockscreen/UserAuthenticatorPam.cpp (+171/-0) lockscreen/UserAuthenticatorPam.h (+66/-0) lockscreen/UserPromptView.cpp (+282/-0) lockscreen/UserPromptView.h (+81/-0) lockscreen/pch/lockscreen_pch.hh (+31/-0) panel/PanelIndicatorEntryView.cpp (+1/-1) panel/PanelIndicatorsView.cpp (+8/-0) panel/PanelIndicatorsView.h (+1/-0) panel/PanelMenuView.cpp (+0/-1) panel/PanelMenuView.h (+0/-1) panel/PanelView.cpp (+5/-10) plugins/unityshell/CMakeLists.txt (+5/-1) plugins/unityshell/src/nux-text-entry-accessible.cpp (+8/-19) plugins/unityshell/src/unity-text-input-accessible.cpp (+90/-0) plugins/unityshell/src/unity-text-input-accessible.h (+57/-0) plugins/unityshell/src/unitya11y.cpp (+5/-0) plugins/unityshell/src/unityshell.cpp (+52/-4) plugins/unityshell/src/unityshell.h (+7/-0) plugins/unityshell/unityshell.xml.in (+20/-0) po/POTFILES.in (+1/-0) services/CMakeLists.txt (+3/-0) services/panel-main.c (+21/-2) services/panel-service.c (+19/-5) services/panel-service.h (+2/-0) services/unity-panel-service-lockscreen.conf.in (+8/-0) shutdown/CMakeLists.txt (+1/-0) shutdown/SessionDBusManager.cpp (+180/-0) shutdown/SessionDBusManager.h (+50/-0) shutdown/StandaloneSession.cpp (+1/-0) tests/CMakeLists.txt (+5/-0) tests/autopilot/unity/tests/launcher/test_icon_behavior.py (+1/-1) tests/autopilot/unity/tests/launcher/test_tooltips.py (+2/-3) tests/autopilot/unity/tests/test_quicklist.py (+11/-6) tests/autopilot/unity/tests/test_spread.py (+1/-1) tests/data/external.gschema.xml (+24/-0) tests/test_gnome_session_manager.cpp (+50/-40) tests/test_lockscreen_controller.cpp (+335/-0) tests/test_mock_session_manager.h (+1/-0) tests/test_text_input.cpp (+4/-2) tests/test_upstart_wrapper.cpp (+90/-0) tests/test_user_authenticator_pam.cpp (+58/-0) tests/test_utils.h (+1/-1) unity-shared/CMakeLists.txt (+1/-0) unity-shared/GtkTexture.h (+64/-0) unity-shared/IMTextEntry.cpp (+3/-2) unity-shared/IMTextEntry.h (+1/-1) unity-shared/MockableBaseWindow.h (+0/-1) unity-shared/TextInput.cpp (+46/-31) unity-shared/TextInput.h (+12/-8) unity-shared/UScreen.cpp (+3/-3) unity-shared/UnityWindowView.cpp (+1/-1) unity-shared/UpstartWrapper.cpp (+74/-0) unity-shared/UpstartWrapper.h (+53/-0) unity-shared/WindowManager.h (+1/-0) |
To merge this branch: | bzr merge lp://staging/~azzar1/unity/lockscreen |
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Marco Trevisan (Treviño) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Robert Ancell | Approve | ||
Sebastien Bacher | Needs Information | ||
Review via email:
|
Commit message
Implement the lockscreen in Unity that looks like unity-greeter. Also allow to fallback to lightdm + greeter (tty switching) in case you need more pam power.
Description of the change
== General ==
Implement the lockscreen in Unity that looks like unity-greeter. Also allow to fallback to lightdm + greeter (tty switching) in case you need more pam power.
== Known issues ==
1. The panel is not 50% transparent (FIXED)
2. No way to switch user from the lockscreen (FIXED lp:~andyrock/indicator-session/lockscreen/+merge/207591)
3. alt+f10 shortcut does not work in the lockscreen (FIXED in lp:~3v1n0/unity/lockscreen-panel)
4. Accessibilty not fully implemented (keyboard and screen-reader work, high-contrast need to be implemented)
See: lp:~andyrock/nux/view-added/+merge/207763
5. Not full pam support (FIXED)
Remaining issues can be fixed just falling back to lightdm (there is an option in ccsm).
== Notes ==
When testing make sure to run the correct panel service.
At the moment you can lock the screen just using the shortcut (Super+L) or the command:
sudo loginctl lock-sessions
That's because session-menu->Lock does call gnome-screensaver methods to lock the screen.
I'll propose a branch as soon as possible.
FAILED: Continuous integration, rev:3664 jenkins. qa.ubuntu. com/job/ unity-ci/ 629/ jenkins. qa.ubuntu. com/job/ unity-trusty- amd64-ci/ 165/console jenkins. qa.ubuntu. com/job/ unity-trusty- armhf-ci/ 161/console jenkins. qa.ubuntu. com/job/ unity-trusty- i386-ci/ 163/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity- ci/629/ rebuild
http://