Merge lp:~lukas-kde/unity8/pinLockHWKeyboard into lp:unity8

[Lukáš Tinkl]

Enable the PIN lockscreen to be used with a HW keyboard

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

[lp:~lukas-kde/unity8/pinLockHWKeyboard]

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

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2207
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/507/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/671
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/694
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/712
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/712
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/708
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/708/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/708
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/708/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/708
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/708/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/708
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/708/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/708
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/708/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/708
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/708/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/507/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2207
http://jenkins.qa.ubuntu.com/job/unity8-ci/7434/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6667
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/849/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/2139
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/842/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/2034
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/2034
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/841
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/840
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/5061
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6678
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6678/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27937
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/446/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/847
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/847/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27936

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7434/rebuild

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2207
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/509/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/673
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay/244
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial/244
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay/246/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=phone-armhf,release=xenial/246/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/696
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/713
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/713
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/709
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/709/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/709
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/709/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/709
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/709/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/709
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/709/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/709
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/709/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/709
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/709/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/509/rebuild

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2210
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/510/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/674
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay/248
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial/248
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay/249
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=phone-armhf,release=xenial/249/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/697
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/715
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/715
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/711
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/711/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/711
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/711/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/711
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/711/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/711
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/711/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/711
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/711/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/711
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/711/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/510/rebuild

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2210
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/511/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/675
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay/251
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial/251
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay/252/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/698
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/716
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/716
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/712
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/712/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/712
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/712/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/712
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/712/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/712
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/712/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/712
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/712/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/712
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/712/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/511/rebuild

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2210
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/512/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/676
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay/253
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial/253
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay/254/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/699
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/717
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/717
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/713
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/713/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/713
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/713/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/713
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/713/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/713
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/713/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/713
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/713/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/713
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/713/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/512/rebuild

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:2210
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/513/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/677
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay/255
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial/255
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay/257
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/700
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/718
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/718
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/714
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/714/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/714
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/714/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/714
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/714/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/714
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/714/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/714
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/714/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/714
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/714/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/513/rebuild

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

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.

review: Needs Fixing

[lp:~lukas-kde/unity8/pinLockHWKeyboard]

2211. By Lukáš Tinkl on 2016-03-01

fix focus when coming from greeter

[Lukáš Tinkl (lukas-kde)]

> 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)]

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?

review: Needs Fixing

[lp:~lukas-kde/unity8/pinLockHWKeyboard]

2212. By Lukáš Tinkl on 2016-03-01

return early to prevent accepting key presses past the max length

[Lukáš Tinkl (lukas-kde)]

> 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)]

Looks nice :)

One minor nitpick

} else if (event.key === Qt.Key_Delete) {
    closeButton.clicked()

I don't mind if you keep "Del" being close, but can we add "Esc" too?

review: Needs Information

[lp:~lukas-kde/unity8/pinLockHWKeyboard]

2213. By Lukáš Tinkl on 2016-03-02

close also on Esc

[Lukáš Tinkl (lukas-kde)]

> Looks nice :)
>
> One minor nitpick
>
> } else if (event.key === Qt.Key_Delete) {
> closeButton.clicked()
>
> I don't mind if you keep "Del" being close, but can we add "Esc" too?

Done :)

[Albert Astals Cid (aacid)]

 * 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

review: Approve

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:2212
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/551/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/305
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial,testname=qmluitests.sh/305
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=autopilot.sh/305
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/740
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/757
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/757
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/753
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/753/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/753
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/753/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/753
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/753/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/753
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/753/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/753
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/753/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/753
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/753/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/551/rebuild

review: Approve (continuous-integration)

[lp:~lukas-kde/unity8/pinLockHWKeyboard]

2214. By Lukáš Tinkl on 2016-03-05

merge trunk

=== modified file 'qml/Components/Lockscreen.qml'
--- qml/Components/Lockscreen.qml	2015-07-15 15:07:19 +0000
+++ qml/Components/Lockscreen.qml	2016-03-05 10:19:12 +0000
@@ -121,107 +121,93 @@
         opacity: root.darkenBackground
     }
 
-    MouseArea {
-        anchors.fill: root
-        onClicked: {
-            if (pinPadLoader.item)
-                pinPadLoader.item.forceActiveFocus()
-        }
-    }
-
-    FocusScope {
-        id: loaderScope
+    Loader {
+        id: pinPadLoader
+        objectName: "pinPadLoader"
         anchors.fill: parent
-
-        Loader {
-            id: pinPadLoader
-            objectName: "pinPadLoader"
-            anchors.fill: parent
-            property bool resetting: false
-            property bool waiting: false
-            property bool showWrongText: false
-
-            source: {
-                if (resetting || !root.required) {
-                    return ""
-                } else if (root.delayMinutes > 0) {
-                    return "DelayedLockscreen.qml"
-                } else if (root.alphaNumeric) {
-                    return "PassphraseLockscreen.qml"
-                } else {
-                    return "PinLockscreen.qml"
-                }
-            }
-            onSourceChanged: {
-                waiting = false
-                showWrongText = false
-                if (loaderScope.activeFocus && pinPadLoader.item)
-                    pinPadLoader.item.forceActiveFocus()
-            }
-
-            Connections {
-                target: pinPadLoader.item
-
-                onEntered: {
-                    pinPadLoader.waiting = true
-                    root.entered(passphrase);
-                }
-
-                onCancel: {
-                    root.cancel()
-                }
-            }
-
-            Binding {
-                target: pinPadLoader.item
-                property: "minPinLength"
-                value: root.minPinLength
-            }
-            Binding {
-                target: pinPadLoader.item
-                property: "maxPinLength"
-                value: root.maxPinLength
-            }
-            Binding {
-                target: pinPadLoader.item
-                property: "infoText"
-                value: root.infoText
-            }
-            Binding {
-                target: pinPadLoader.item
-                property: "retryText"
-                value: root.retryText
-            }
-            Binding {
-                target: pinPadLoader.item
-                property: "errorText"
-                value: pinPadLoader.showWrongText ? root.errorText : ""
-            }
-            Binding {
-                target: pinPadLoader.item
-                property: "entryEnabled"
-                value: !pinPadLoader.waiting
-            }
-            Binding {
-                target: pinPadLoader.item
-                property: "alphaNumeric"
-                value: root.alphaNumeric
-            }
-            Binding {
-                target: pinPadLoader.item
-                property: "delayMinutes"
-                value: root.delayMinutes
-            }
-            Binding {
-                target: pinPadLoader.item
-                property: "showCancelButton"
-                value: root.showCancelButton
-            }
-            Binding {
-                target: pinPadLoader.item
-                property: "foregroundColor"
-                value: root.foregroundColor
-            }
+        property bool resetting: false
+        property bool waiting: false
+        property bool showWrongText: false
+        focus: true
+
+        source: {
+            if (resetting || !root.required) {
+                return ""
+            } else if (root.delayMinutes > 0) {
+                return "DelayedLockscreen.qml"
+            } else if (root.alphaNumeric) {
+                return "PassphraseLockscreen.qml"
+            } else {
+                return "PinLockscreen.qml"
+            }
+        }
+        onSourceChanged: {
+            waiting = false
+            showWrongText = false
+        }
+
+        Connections {
+            target: pinPadLoader.item
+
+            onEntered: {
+                pinPadLoader.waiting = true
+                root.entered(passphrase);
+            }
+
+            onCancel: {
+                root.cancel()
+            }
+        }
+
+        Binding {
+            target: pinPadLoader.item
+            property: "minPinLength"
+            value: root.minPinLength
+        }
+        Binding {
+            target: pinPadLoader.item
+            property: "maxPinLength"
+            value: root.maxPinLength
+        }
+        Binding {
+            target: pinPadLoader.item
+            property: "infoText"
+            value: root.infoText
+        }
+        Binding {
+            target: pinPadLoader.item
+            property: "retryText"
+            value: root.retryText
+        }
+        Binding {
+            target: pinPadLoader.item
+            property: "errorText"
+            value: pinPadLoader.showWrongText ? root.errorText : ""
+        }
+        Binding {
+            target: pinPadLoader.item
+            property: "entryEnabled"
+            value: !pinPadLoader.waiting
+        }
+        Binding {
+            target: pinPadLoader.item
+            property: "alphaNumeric"
+            value: root.alphaNumeric
+        }
+        Binding {
+            target: pinPadLoader.item
+            property: "delayMinutes"
+            value: root.delayMinutes
+        }
+        Binding {
+            target: pinPadLoader.item
+            property: "showCancelButton"
+            value: root.showCancelButton
+        }
+        Binding {
+            target: pinPadLoader.item
+            property: "foregroundColor"
+            value: root.foregroundColor
         }
     }
 

=== modified file 'qml/Components/PassphraseLockscreen.qml'
--- qml/Components/PassphraseLockscreen.qml	2015-07-15 15:07:19 +0000
+++ qml/Components/PassphraseLockscreen.qml	2016-03-05 10:19:12 +0000
@@ -18,10 +18,11 @@
 import Ubuntu.Components 1.3
 import "../Components"
 
-Item {
+FocusScope {
     id: root
     y: units.gu(4)
     height: shakeContainer.height
+    focus: true
 
     property string infoText
     property string errorText
@@ -42,8 +43,6 @@
         }
     }
 
-    onActiveFocusChanged: if (activeFocus) pinentryField.forceActiveFocus()
-
     Column {
         id: shakeContainer
         anchors.horizontalCenter: parent.horizontalCenter
@@ -59,14 +58,16 @@
             text: root.infoText
         }
 
-        Item {
+        FocusScope {
             id: entryContainer
             anchors { left: parent.left; right: parent.right; margins: units.gu(2) }
             height: units.gu(4)
+            focus: true
 
             TextInput {
                 id: pinentryField
                 objectName: "pinentryField"
+                focus: true
 
                 property bool incorrectOverride: false
 

=== modified file 'qml/Components/PinLockscreen.qml'
--- qml/Components/PinLockscreen.qml	2015-07-15 15:07:19 +0000
+++ qml/Components/PinLockscreen.qml	2016-03-05 10:19:12 +0000
@@ -19,8 +19,9 @@
 import Ubuntu.Components.ListItems 1.3
 import "../Components"
 
-Item {
+FocusScope {
     id: root
+    focus: true
 
     property string infoText
     property string retryText
@@ -45,6 +46,24 @@
         }
     }
 
+    Keys.onPressed: {
+        if (pinentryField.text.length == root.maxPinLength)
+            return;
+
+        if (event.key === Qt.Key_Backspace) {
+            pinentryField.backspace();
+        } else if (event.key === Qt.Key_Delete || event.key === Qt.Key_Escape) {
+            closeButton.clicked()
+        } else if (event.key === Qt.Key_Enter || event.key === Qt.Key_Return) {
+            confirmButton.clicked()
+        } else {
+            var digit = parseInt(event.text);
+            if (!isNaN(digit) && typeof digit == "number") {
+                pinentryField.appendNumber(digit);
+            }
+        }
+    }
+
     Column {
         anchors {
             left: parent.left;
@@ -204,6 +223,7 @@
                 width: numbersGrid.buttonWidth
             }
             PinPadButton {
+                id: closeButton
                 iconName: "close"
                 height: units.gu(5) // visual spec has this row a little closer in
                 width: numbersGrid.buttonWidth
@@ -216,6 +236,7 @@
                 width: numbersGrid.buttonWidth
             }
             PinPadButton {
+                id: confirmButton
                 iconName: "tick"
                 objectName: "confirmButton"
                 height: units.gu(5)

=== modified file 'qml/Greeter/NarrowView.qml'
--- qml/Greeter/NarrowView.qml	2015-11-19 16:55:31 +0000
+++ qml/Greeter/NarrowView.qml	2016-03-05 10:19:12 +0000
@@ -125,6 +125,18 @@
         onCancel: coverPage.show()
         onEmergencyCall: root.emergencyCall()
 
+        onEnabledChanged: {
+            if (enabled) {
+                lockscreen.forceActiveFocus();
+            }
+        }
+
+        onVisibleChanged: {
+            if (visible) {
+                lockscreen.forceActiveFocus();
+            }
+        }
+
         function maybeShow() {
             if (root.locked && !shown) {
                 showNow();

=== modified file 'tests/qmltests/Components/tst_Lockscreen.qml'
--- tests/qmltests/Components/tst_Lockscreen.qml	2015-07-15 15:07:19 +0000
+++ tests/qmltests/Components/tst_Lockscreen.qml	2016-03-05 10:19:12 +0000
@@ -235,11 +235,14 @@
 
         function test_unlock_data() {
             return [
-                {tag: "numeric", alphanumeric: false, password: "1234", minPinLength: 4, maxPinLength: 4},
-                {tag: "alphanumeric",  alphanumeric: true, password: "password", minPinLength: -1, maxPinLength: -1},
-                {tag: "numeric (wrong)",  alphanumeric: false, password: "4321", minPinLength: 4, maxPinLength: 4},
-                {tag: "alphanumeric (wrong)",  alphanumeric: true, password: "drowssap", minPinLength: -1, maxPinLength: -1},
-                {tag: "flexible length",  alphanumeric: false, password: "1234", minPinLength: -1, maxPinLength: -1},
+                {tag: "numeric", alphanumeric: false, password: "1234", minPinLength: 4, maxPinLength: 4, keyboard: false},
+                {tag: "alphanumeric",  alphanumeric: true, password: "password", minPinLength: -1, maxPinLength: -1, keyboard: false},
+                {tag: "numeric (wrong)",  alphanumeric: false, password: "4321", minPinLength: 4, maxPinLength: 4, keyboard: false},
+                {tag: "alphanumeric (wrong)",  alphanumeric: true, password: "drowssap", minPinLength: -1, maxPinLength: -1, keyboard: false},
+                {tag: "flexible length",  alphanumeric: false, password: "1234", minPinLength: -1, maxPinLength: -1, keyboard: false},
+                {tag: "numeric", alphanumeric: false, password: "1234", minPinLength: 4, maxPinLength: 4, keyboard: true},
+                {tag: "numeric (wrong)",  alphanumeric: false, password: "4321", minPinLength: 4, maxPinLength: 4, keyboard: true},
+                {tag: "flexible length",  alphanumeric: false, password: "1234", minPinLength: -1, maxPinLength: -1, keyboard: true}
             ]
         }
 
@@ -259,8 +262,12 @@
             } else {
                 for (var i = 0; i < data.password.length; ++i) {
                     var character = data.password.charAt(i)
-                    var button = findChild(lockscreen, "pinPadButton" + character)
-                    mouseClick(button, units.gu(1), units.gu(1))
+                    if (data.keyboard) {
+                        typeString(character)
+                    } else {
+                        var button = findChild(lockscreen, "pinPadButton" + character)
+                        mouseClick(button, units.gu(1), units.gu(1))
+                    }
                 }
                 var confirmButton = findChild(lockscreen, "confirmButton");
                 mouseClick(confirmButton, units.gu(1), units.gu(1));