git.iko.soy/unity8
on xenial help sign in
update as per design review
034e678Michael Zanetti
qml/Components/Lockscreen.qml−1
compare with xenial
unifiedsplit
@@ -206,7 +206,6 @@ Showable {
206 text: i18n.tr("Emergency Call")
206 text: i18n.tr("Emergency Call")
207 color: "#f3f3e7"
207 color: "#f3f3e7"
208 opacity: 0.6
208 opacity: 0.6
209− fontSize: "small"
210 }
209 }
211
210
212 MouseArea {
211 MouseArea {
qml/Components/PinLockscreen.qml+1
@@ -208,6 +208,7 @@ Column {
208 height: numbersGrid.buttonHeight
208 height: numbersGrid.buttonHeight
209 width: numbersGrid.buttonWidth
209 width: numbersGrid.buttonWidth
210 enabled: root.enabled && pinentryField.text.length >= root.minPinLength
210 enabled: root.enabled && pinentryField.text.length >= root.minPinLength
211+ visible: root.minPinLength == -1 || root.minPinLength !== root.maxPinLength
211
212
212 onClicked: root.entered(pinentryField.text)
213 onClicked: root.entered(pinentryField.text)
213 }
214 }
qml/Shell.qml+2−2
@@ -266,8 +266,8 @@ Item {
266 lockscreen.infoText = i18n.tr("Enter your passphrase")
266 lockscreen.infoText = i18n.tr("Enter your passphrase")
267 lockscreen.errorText = i18n.tr("Sorry, incorrect passphrase")
267 lockscreen.errorText = i18n.tr("Sorry, incorrect passphrase")
268 } else {
268 } else {
269− lockscreen.infoText = i18n.tr("Enter your passcode")
269+ lockscreen.infoText = i18n.tr("Enter your PIN")
270− lockscreen.errorText = i18n.tr("Sorry, incorrect passcode")
270+ lockscreen.errorText = i18n.tr("Sorry, incorrect PIN")
271 }
271 }
272 } else {
272 } else {
273 lockscreen.infoText = i18n.tr("Enter your %1").arg(text.toLowerCase())
273 lockscreen.infoText = i18n.tr("Enter your %1").arg(text.toLowerCase())
tests/qmltests/Greeter/tst_Lockscreen.qml+7−5
@@ -374,16 +374,18 @@ Rectangle {
374
374
375 function test_minMaxLength(data) {
375 function test_minMaxLength(data) {
376 pinPadCheckBox.checked = false
376 pinPadCheckBox.checked = false
377− minPinLengthTextField.text = data.minPinLength
377+ minPinLengthTextField.text = data.minPinLength;
378− maxPinLengthTextField.text = data.maxPinLength
378+ maxPinLengthTextField.text = data.maxPinLength;
379 waitForLockscreenReady();
379 waitForLockscreenReady();
380
380
381 var pinPadButton5 = findChild(lockscreen, "pinPadButton5");
381 var pinPadButton5 = findChild(lockscreen, "pinPadButton5");
382 var backspaceButton = findChild(lockscreen, "backspaceIcon");
382 var backspaceButton = findChild(lockscreen, "backspaceIcon");
383 var confirmButton = findChild(lockscreen, "confirmButton");
383 var confirmButton = findChild(lockscreen, "confirmButton");
384− var inputField = findChild(lockscreen, "pinentryField")
384+ var inputField = findChild(lockscreen, "pinentryField");
385+
386+ tryCompare(backspaceButton, "opacity", 0);
385
387
386− tryCompare(backspaceButton, "opacity", 0)
388+ tryCompare(confirmButton, "visible", (data.minPinLength != data.maxPinLength) || (data.minPinLength == -1));
387
389
388 for (var i = 0; i < 10; i++) {
390 for (var i = 0; i < 10; i++) {
389 mouseClick(pinPadButton5, units.gu(1), units.gu(1));
391 mouseClick(pinPadButton5, units.gu(1), units.gu(1));
@@ -419,7 +421,7 @@ Rectangle {
419
421
420 function test_retryDisplay_data() {
422 function test_retryDisplay_data() {
421 return [
423 return [
422− {tag: "empty", retryText: ""},
424+ {tag: "empty", retryText: " "},
423 {tag: "3 retries left", retryText: "3 retries left"},
425 {tag: "3 retries left", retryText: "3 retries left"},
424 ]
426 ]
425 }
427 }
tests/qmltests/tst_ShellWithPin.qml+2−2
@@ -220,10 +220,10 @@ Item {
220 tryCompare(placeHolder, "text", "")
220 tryCompare(placeHolder, "text", "")
221
221
222 enterPin("1111")
222 enterPin("1111")
223− tryCompare(placeHolder, "text", "Sorry, incorrect passcode")
223+ tryCompare(placeHolder, "text", "Sorry, incorrect PIN")
224
224
225 enterPin("1111")
225 enterPin("1111")
226− tryCompare(placeHolder, "text", "Sorry, incorrect passcode")
226+ tryCompare(placeHolder, "text", "Sorry, incorrect PIN")
227
227
228 enterPin("1111")
228 enterPin("1111")
229 tryCompare(placeHolder, "text", "Too many incorrect attempts")
229 tryCompare(placeHolder, "text", "Too many incorrect attempts")