Merge lp:~jonas-drange/ubuntu-system-settings/security-focus-correct-entry into lp:ubuntu-system-settings

[Jonas G. Drange]

[security-privacy] give the focus to the right entry, if the current
unlock method is swipe then there is no "current password" so the new
input line should be the focussed one

[security-privacy] give the focus to the right entry, if the current
unlock method is swipe then there is no "current password" so the new
input line should be the focussed one

[lp:~jonas-drange/ubuntu-system-settings/security-focus-correct-entry]

1384. By Jonas G. Drange on 2015-04-15

use assertTrue

1385. By Jonas G. Drange on 2015-04-15

handle the case where security is swipe

[Sebastien Bacher (seb128)]

looks fine to me, thanks

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1384
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2058/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2254
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/328
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1979
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2252
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2252/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19660

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2058/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1385
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2060/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2266
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/330
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1990
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2264
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2264/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19676

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2060/rebuild

review: Approve (continuous-integration)

=== modified file 'plugins/security-privacy/LockSecurity.qml'
--- plugins/security-privacy/LockSecurity.qml	2015-02-09 15:46:27 +0000
+++ plugins/security-privacy/LockSecurity.qml	2015-04-15 16:40:34 +0000
@@ -29,6 +29,7 @@
 
 ItemPage {
     id: page
+    objectName: "lockSecurityPage"
     title: i18n.tr("Lock security")
 
     // The user can still press the main "back" button or other buttons on the
@@ -94,6 +95,7 @@
 
         Dialog {
             id: changeSecurityDialog
+            objectName: "changeSecurityDialog"
 
             function displayMismatchWarning() {
                 /* If the entry have the same length and different content,
@@ -159,6 +161,7 @@
 
             TextField {
                 id: currentInput
+                objectName: "currentInput"
                 echoMode: TextInput.Password
                 inputMethodHints: {
                     if (changeSecurityDialog.oldMethod ===
@@ -181,7 +184,10 @@
                             UbuntuSecurityPrivacyPanel.Swipe)
                         confirmButton.enabled = text.length > 0
                 }
-                Component.onCompleted: forceActiveFocus()
+                Component.onCompleted: {
+                    if (securityPrivacy.securityType !== UbuntuSecurityPrivacyPanel.Swipe)
+                        forceActiveFocus()
+                }
             }
 
             /* Using bindings since it is, according to documentation,
@@ -226,6 +232,7 @@
 
             TextField {
                 id: newInput
+                objectName: "newInput"
                 echoMode: TextInput.Password
                 inputMethodHints: {
                     if (changeSecurityDialog.newMethod ===
@@ -244,6 +251,10 @@
                          changeSecurityDialog.newMethod ===
                             UbuntuSecurityPrivacyPanel.Passphrase
                 onTextChanged: { displayMismatchWarning() }
+                Component.onCompleted: {
+                    if (securityPrivacy.securityType === UbuntuSecurityPrivacyPanel.Swipe)
+                        forceActiveFocus()
+                }
             }
 
             /* Using bindings since it is, according to documentation,
@@ -434,6 +445,18 @@
             id: unlockMethod
             model: 3
             delegate: OptionSelectorDelegate {
+                objectName: {
+                    switch (index) {
+                        case 0:
+                            return "method_swipe";
+                        case 1:
+                            return "method_code";
+                        case 2:
+                            return "method_phrase";
+                        default:
+                            return "method_unknown";
+                    }
+                }
                 text: index == 0 ? (unlockMethod.selectedIndex == 0 ? unlockMethod.swipe : unlockMethod.swipeAlt) :
                      (index == 1 ? (unlockMethod.selectedIndex == 1 ? unlockMethod.passcode : unlockMethod.passcodeAlt) :
                                    (unlockMethod.selectedIndex == 2 ? unlockMethod.passphrase : unlockMethod.passphraseAlt))
@@ -466,6 +489,7 @@
                 property bool passcode: securityPrivacy.securityType ===
                                         UbuntuSecurityPrivacyPanel.Passcode
 
+                objectName: "changePass"
                 enabled: parent.visible
 
                 text: passcode ? changePasscode : changePassphrase
 
=== modified file 'plugins/security-privacy/PhoneLocking.qml'
--- plugins/security-privacy/PhoneLocking.qml	2015-02-09 15:42:47 +0000
+++ plugins/security-privacy/PhoneLocking.qml	2015-04-15 16:40:34 +0000
@@ -46,6 +46,7 @@
             property string passcode: i18n.tr("Passcode")
             property string passphrase: i18n.tr("Passphrase")
 
+            objectName: "lockSecurity"
             text: i18n.tr("Lock security")
             value: {
                 switch (securityPrivacy.securityType) {
 
=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_security.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_security.py	2015-02-19 15:18:09 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_security.py	2015-04-15 16:40:34 +0000
@@ -139,6 +139,47 @@
             Equals(_('Phone locking'))
         )
 
+    def test_lock_security_focus_on_entry(self):
+        self._go_to_phone_lock()
+
+        phone_lock_page = self.main_view.select_single(
+            objectName='phoneLockingPage')
+        selector = phone_lock_page.select_single(objectName='lockSecurity')
+        self.main_view.scroll_to_and_click(selector)
+
+        lock_security_page = self.main_view.wait_select_single(
+            objectName='lockSecurityPage')
+
+        # Find the selected security method.
+        unlock_methods = ['method_swipe', 'method_code', 'method_phrase']
+        selected_method = None
+        for m in unlock_methods:
+            if lock_security_page.select_single(objectName=m).selected:
+                selected_method = m
+
+        # If swipe is the selected security, we trigger the dialog by
+        # changing the security to method_code
+        if selected_method == 'method_swipe':
+            dialog_trigger = lock_security_page.select_single(
+                objectName='method_code')
+            input_selector = 'newInput'
+        else:
+            # If the security is anything besides swipe, we trigger the dialog
+            # by changing the code/phrase.
+            dialog_trigger = lock_security_page.select_single(
+                objectName='changePass')
+            input_selector = 'currentInput'
+
+        # Trigger dialog.
+        self.main_view.scroll_to_and_click(dialog_trigger)
+
+        # Find the text input.
+        dialog = self.main_view.wait_select_single(
+            objectName='changeSecurityDialog')
+        text_input = dialog.wait_select_single(
+            objectName=input_selector)
+        self.assertTrue(text_input.focus)
+
     def test_phone_lock_value(self):
         self._go_to_phone_lock()
         phone_lock_page = self.main_view.select_single(