Merge lp:~renatofilho/address-book-app/fix-next-key into lp:address-book-app

[Renato Araujo Oliveira Filho]

Used new "nextItemInFocusChain" function to change field focus while pressing "next" key on keyboard.

[Renato Araujo Oliveira Filho (renatofilho)]

Are there any related MPs required for this MP to build/function as expected?
NO

Is your branch in sync with latest trunk?
YES

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
YES

Did you successfully run all tests found in your component's Test Plan on device or emulator?
YES

If you changed the UI, was the change specified/approved by design?
NO UI CHANGED

If you changed UI labels, did you update the pot file?
NO LABLES CHANGED

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
NO PACKAGE CHANGED

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:442
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/833/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/136
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3108
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2616
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3106
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3106/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21011

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/833/rebuild

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

Code looks good and works as expected!

review: Approve

=== modified file 'src/app/addressbookapp.cpp'
--- src/app/addressbookapp.cpp	2015-05-07 17:27:16 +0000
+++ src/app/addressbookapp.cpp	2015-06-08 16:01:16 +0000
@@ -261,15 +261,6 @@
     settings.sync();
 }
 
-void AddressBookApp::sendTabEvent() const
-{
-    QKeyEvent keyPressEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier);
-    sendEvent(m_view, &keyPressEvent);
-
-    QKeyEvent keyReleaseEvent(QEvent::KeyRelease, Qt::Key_Tab, Qt::NoModifier);
-    sendEvent(m_view, &keyReleaseEvent);
-}
-
 void AddressBookApp::goBackToSourceApp()
 {
     if (!m_callbackApplication.isEmpty()) {

=== modified file 'src/app/addressbookapp.h'
--- src/app/addressbookapp.h	2015-05-07 17:27:16 +0000
+++ src/app/addressbookapp.h	2015-06-08 16:01:16 +0000
@@ -49,7 +49,6 @@
     void returnVcard(const QUrl &url);
     bool isFirstRun() const;
     void unsetFirstRun() const;
-    void sendTabEvent() const;
     void goBackToSourceApp();
 
     // debug

=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/TextInputDetail.qml'
--- src/imports/Ubuntu/AddressBook/ContactEditor/TextInputDetail.qml	2015-05-07 17:27:16 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/TextInputDetail.qml	2015-06-08 16:01:16 +0000
@@ -92,6 +92,11 @@
             family: "Ubuntu"
             pixelSize: activeFocus ? FontUtils.sizeToPixels("large") : FontUtils.sizeToPixels("medium")
         }
-        Keys.onReturnPressed: application.sendTabEvent();
+        Keys.onReturnPressed: {
+            var next = field.nextItemInFocusChain(true)
+            if (next) {
+                next.forceActiveFocus()
+            }
+        }
     }
 }

=== modified file 'tests/qml/tst_ContactEditor.qml'
--- tests/qml/tst_ContactEditor.qml	2015-04-29 14:22:40 +0000
+++ tests/qml/tst_ContactEditor.qml	2015-06-08 16:01:16 +0000
@@ -129,5 +129,22 @@
             var saveButton = findChild(root, 'save_header_button');
             tryCompare(saveButton, 'enabled', false);
         }
+
+        function test_enterKeyMoveFocusedItem() {
+            // firstName start with focus
+            var textField = findChild(root, 'firstName');
+            textField.forceActiveFocus()
+            tryCompare(textField, 'activeFocus', true)
+
+            // send a keyreturn click
+            keyClick(Qt.Key_Return)
+
+            // firstName must lost focus
+            tryCompare(textField, 'activeFocus', false)
+
+            // lastName must gain focus
+            textField = findChild(root, 'lastName');
+            tryCompare(textField, 'activeFocus', true)
+        }
     }
 }