Merge lp:~ken-vandine/content-hub/picker_more_ap_friendly into lp:content-hub

[Ken VanDine]

Added objectName to the cancel button in the ContentPeerPicker, it'll be useful for autopilot tests.

Added objectName to the cancel button in the ContentPeerPicker, it'll be useful for autopilot tests.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:112
http://jenkins.qa.ubuntu.com/job/content-hub-ci/164/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/21/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-i386-ci/21

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/164/rebuild

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

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

 * No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * 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 (https://wiki.ubuntu.com/Process/Merges/TestPlan/content-hub) on device or emulator?

 * Yes

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

 * No change

If you changed the packaging (debian), did you subscribe a core-dev to this MP?

 * No change

[Michael Sheldon (michael-sheldon)]

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

review: Approve

=== modified file 'import/Ubuntu/Content/ContentPeerPicker.qml'
--- import/Ubuntu/Content/ContentPeerPicker.qml	2014-05-27 11:51:21 +0000
+++ import/Ubuntu/Content/ContentPeerPicker.qml	2014-06-05 18:10:00 +0000
@@ -288,7 +288,8 @@
 
     Button {
         id: cancelButton
-        text: "Cancel"
+        objectName: "contentPeerPickerCancelButton"
+        text: i18n.tr("Cancel")
         anchors {
             left: parent.left
             bottom: parent.bottom