Merge lp:~3v1n0/unity/lockscreen-num-lock-warning into lp:unity
Status: | Merged |
---|---|
Approved by: | Andrea Azzarone on 2015-11-17 |
Approved revision: | 4029 |
Merged at revision: | 4044 |
Proposed branch: | lp:~3v1n0/unity/lockscreen-num-lock-warning |
Merge into: | lp:unity |
Diff against target: |
167 lines (+45/-31) 3 files modified
lockscreen/UserPromptView.cpp (+1/-1) unity-shared/TextInput.cpp (+39/-24) unity-shared/TextInput.h (+5/-6) |
To merge this branch: | bzr merge lp:~3v1n0/unity/lockscreen-num-lock-warning |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Andrea Azzarone (community) | 2015-11-06 | Approve on 2015-11-17 | |
PS Jenkins bot (community) | continuous-integration | Needs Fixing on 2015-11-06 | |
Review via email:
|
Commit message
TextInput: show warning also when num lock is enabled
- 4029. By Marco Trevisan (Treviño) on 2015-11-06
-
UserPromptView: use show_lock_warnings
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:4029
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
Andrea Azzarone (azzar1) wrote : | # |
OnLockStateChanged and CheckLocks are poorly named IMHO. CheckLockWarnings?
Andrea Azzarone (azzar1) wrote : | # |
Nevermind my fault, they look good.
Johan Boule (johan-boule) wrote : | # |
Some people see this new feature as a bug :|
See bug #1526322
FAILED: Continuous integration, rev:4028 jenkins. qa.ubuntu. com/job/ unity-ci/ 1343/ jenkins. qa.ubuntu. com/job/ unity-wily- amd64-ci/ 120 jenkins. qa.ubuntu. com/job/ unity-wily- armhf-ci/ 119 jenkins. qa.ubuntu. com/job/ unity-wily- i386-ci/ 118/console
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity- ci/1343/ rebuild
http://