address-book-app

Merge lp:~renatofilho/address-book-app/new-import-from-sim-icon into lp:address-book-app

  1. new-import-from-sim-icon
  2. Merge into trunk
Proposed by Renato Araujo Oliveira Filho
Status: Superseded
Proposed branch: lp:~renatofilho/address-book-app/new-import-from-sim-icon
Merge into: lp:address-book-app
Diff against target: 12 lines (+1/-1)
1 file modified
src/imports/Ubuntu/Contacts/ContactListView.qml (+1/-1)
To merge this branch: bzr merge lp:~renatofilho/address-book-app/new-import-from-sim-icon
Reviewer Review Type Date Requested Status
Michael Sheldon (community) Approve
PS Jenkins bot continuous-integration Needs Fixing
Review via email: mp+273267@code.launchpad.net

This proposal has been superseded by a proposal from 2015-10-28.

Commit message

Used import icon in the "import from sim" button

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:481
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/947/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/250
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4481
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3644
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4478
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4478/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23911

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

review: Approve (continuous-integration)
lp:~renatofilho/address-book-app/new-import-from-sim-icon updated
482. By Renato Araujo Oliveira Filho

Trunk merged.

483. By Renato Araujo Oliveira Filho

Trunk merged.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:482
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/977/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/280
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4866
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3916
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4863
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4863/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24623

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

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:483
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/980/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/283
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4877
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3921
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4874
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4874/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24630

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

Looks good

review: Approve
lp:~renatofilho/address-book-app/new-import-from-sim-icon updated
484. By Renato Araujo Oliveira Filho

Merged fixes on autopilot: ~renatofilho/address-book-app/update-autopilot-with-new-bottom-edge

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/imports/Ubuntu/Contacts/ContactListView.qml'
2--- src/imports/Ubuntu/Contacts/ContactListView.qml 2015-10-26 13:18:11 +0000
3+++ src/imports/Ubuntu/Contacts/ContactListView.qml 2015-10-28 01:10:39 +0000
4@@ -516,7 +516,7 @@
5 objectName: "%1.importFromSimCardButton".arg(root.objectName)
6
7 expandIcon: true
8- iconSource: "image://theme/save-to"
9+ iconSource: "image://theme/import"
10 labelText: i18n.dtr("address-book-app", "Import contacts from SIM card")
11 // Does not show the button if the list is not in a pageStack
12 visible: (typeof(pageStack) !== "undefined") &&

Subscribers

People subscribed via source and target branches