ubuntu-system-settings

Merge lp://staging/~phablet-team/ubuntu-system-settings/fingerprint into lp://staging/ubuntu-system-settings

  1. fingerprint
  2. Merge into trunk
Proposed by Jonas G. Drange
Status: Merged
Approved by: Ken VanDine
Approved revision: 1619
Merged at revision: 1667
Proposed branch: lp://staging/~phablet-team/ubuntu-system-settings/fingerprint
Merge into: lp://staging/ubuntu-system-settings
Diff against target: 459 lines (+187/-18)
6 files modified
debian/control (+4/-3)
plugins/security-privacy/LockSecurity.qml (+118/-12)
plugins/security-privacy/PageComponent.qml (+27/-1)
plugins/security-privacy/PhoneLocking.qml (+6/-1)
plugins/security-privacy/securityprivacy.cpp (+23/-0)
plugins/security-privacy/securityprivacy.h (+9/-1)
To merge this branch: bzr merge lp://staging/~phablet-team/ubuntu-system-settings/fingerprint
Reviewer Review Type Date Requested Status
Jonas G. Drange (community) Needs Fixing
Ken VanDine Approve
system-apps-ci-bot continuous-integration Needs Fixing
PS Jenkins bot continuous-integration Pending
Review via email: mp+297454@code.staging.launchpad.net

Commit message

expose fingerprint ID panel and the Fingerprint lock setting

To post a comment you must log in.
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:1617
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/16/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/614/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/614
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/584
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/584
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/577/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/577/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/577/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/577/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/577/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/577/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/16/rebuild

review: Needs Fixing (continuous-integration)
lp://staging/~phablet-team/ubuntu-system-settings/fingerprint updated
1618. By Jonas G. Drange

reflect changes in usc

1619. By Jonas G. Drange

update c

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:1618
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/17/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/615/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/615
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/585
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/585
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/578/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/578/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/578/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/578/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/578/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/578/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/17/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:1619
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/18/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/617/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/617
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/587
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/587
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/580/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial/580/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/580/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial/580/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/580/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial/580/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/18/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Looks good

review: Approve
Revision history for this message
Jonas G. Drange (jonas-drange) :
review: Needs Fixing

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches