Merge lp:~lukas-kde/unity8/pinLockHWKeyboard into lp:unity8
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Albert Astals Cid on 2016-03-02 | ||||
| Approved revision: | 2213 | ||||
| Merged at revision: | 2264 | ||||
| Proposed branch: | lp:~lukas-kde/unity8/pinLockHWKeyboard | ||||
| Merge into: | lp:unity8 | ||||
| Diff against target: |
359 lines (+139/-112) 5 files modified
qml/Components/Lockscreen.qml (+86/-100) qml/Components/PassphraseLockscreen.qml (+5/-4) qml/Components/PinLockscreen.qml (+22/-1) qml/Greeter/NarrowView.qml (+12/-0) tests/qmltests/Components/tst_Lockscreen.qml (+14/-7) |
||||
| To merge this branch: | bzr merge lp:~lukas-kde/unity8/pinLockHWKeyboard | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Unity8 CI Bot | continuous-integration | Approve on 2016-03-02 | |
| Albert Astals Cid (community) | 2016-02-26 | Approve on 2016-03-02 | |
| PS Jenkins bot | continuous-integration | Needs Fixing on 2016-02-26 | |
|
Review via email:
|
|||
Commit Message
Enable the PIN lockscreen to be used with a HW keyboard
Description of the Change
Enable the PIN lockscreen to be used with a HW keyboard
Also clean up focus related issues byt turning everything into a chain of FocusScopes without manually forcing it.
Checklist:
* Are there any related MPs required for this MP to build/function as expected? Please list.
No
* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes
* Did you make sure that your branch does not contain spurious tags?
Yes
* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A
* If you changed the UI, has there been a design review?
N/A
- 2208. By Lukáš Tinkl on 2016-02-26
-
fix failing tests due to missing focus
- 2209. By Lukáš Tinkl on 2016-02-26
-
modified the unlock() test for the HW keyboard case
- 2210. By Lukáš Tinkl on 2016-02-26
-
also handle Enter/Return keys
| PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:2207
http://
Executed test runs:
UNSTABLE: http://
FAILURE: http://
UNSTABLE: http://
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
| Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2207
https:/
Executed test runs:
SUCCESS: https:/
UNSTABLE: https:/
UNSTABLE: https:/
FAILURE: https:/
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
| Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2210
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
| Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2210
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
| Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2210
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
| Unity8 CI Bot (unity8-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:2210
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
| Albert Astals Cid (aacid) wrote : | # |
On the pin lock screen i first have to press some of the "on screen" 1, 2, 3, etc for the keyboard presses to be detected, otherwise if i just swipe greeter and press keys they are not detected.
- 2211. By Lukáš Tinkl on 2016-03-01
-
fix focus when coming from greeter
| Lukáš Tinkl (lukas-kde) wrote : | # |
> On the pin lock screen i first have to press some of the "on screen" 1, 2, 3,
> etc for the keyboard presses to be detected, otherwise if i just swipe greeter
> and press keys they are not detected.
Fixed
| Albert Astals Cid (aacid) wrote : | # |
I think we should disable they keyboard input the same moment we disable the buttons, i.e. pressing the buttons is impossible i never enter more than 4 numbers, with the keyboard i can get 5 "dots" on screen that can be somehow confusing.
What do you think?
- 2212. By Lukáš Tinkl on 2016-03-01
-
return early to prevent accepting key presses past the max length
| Lukáš Tinkl (lukas-kde) wrote : | # |
> I think we should disable they keyboard input the same moment we disable the
> buttons, i.e. pressing the buttons is impossible i never enter more than 4
> numbers, with the keyboard i can get 5 "dots" on screen that can be somehow
> confusing.
>
> What do you think?
Yup, that makes sense, added a check for the max length
| Albert Astals Cid (aacid) wrote : | # |
Looks nice :)
One minor nitpick
} else if (event.key === Qt.Key_Delete) {
closeButton
I don't mind if you keep "Del" being close, but can we add "Esc" too?
- 2213. By Lukáš Tinkl on 2016-03-02
-
close also on Esc
| Lukáš Tinkl (lukas-kde) wrote : | # |
> Looks nice :)
>
> One minor nitpick
>
> } else if (event.key === Qt.Key_Delete) {
> closeButton.
>
> I don't mind if you keep "Del" being close, but can we add "Esc" too?
Done :)
| Albert Astals Cid (aacid) wrote : | # |
* Did you perform an exploratory manual test run of the code change and any related functionality?
Yes
* Did CI run pass? If not, please explain why.
CI is sleeping, ran locally and passed
* Did you make sure that the branch does not contain spurious tags?
Yes
| Unity8 CI Bot (unity8-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:2212
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 2214. By Lukáš Tinkl on 2016-03-05
-
merge trunk
FAILED: Continuous integration, rev:2207
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/