Merge lp://qastaging/~jonas-drange/ubuntu-settings-components/fingerprint into lp://qastaging/~registry/ubuntu-settings-components/trunk
Status: | Work in progress |
---|---|
Proposed branch: | lp://qastaging/~jonas-drange/ubuntu-settings-components/fingerprint |
Merge into: | lp://qastaging/~registry/ubuntu-settings-components/trunk |
Diff against target: |
4419 lines (+4053/-18) 55 files modified
debian/control (+5/-2) examples/Fingerprint.qml (+43/-0) plugins/Ubuntu/Settings/CMakeLists.txt (+1/-0) plugins/Ubuntu/Settings/Fingerprint/CMakeLists.txt (+15/-0) plugins/Ubuntu/Settings/Fingerprint/CircularSegment.qml (+64/-0) plugins/Ubuntu/Settings/Fingerprint/DirectionVisual.qml (+103/-0) plugins/Ubuntu/Settings/Fingerprint/Fingerprint.qml (+133/-0) plugins/Ubuntu/Settings/Fingerprint/FingerprintVisual.qml (+72/-0) plugins/Ubuntu/Settings/Fingerprint/Fingerprints.qml (+440/-0) plugins/Ubuntu/Settings/Fingerprint/SegmentBoundingBoxes.qml (+81/-0) plugins/Ubuntu/Settings/Fingerprint/SegmentRenderer.qml (+95/-0) plugins/Ubuntu/Settings/Fingerprint/SegmentedImage.qml (+52/-0) plugins/Ubuntu/Settings/Fingerprint/Setup.qml (+388/-0) plugins/Ubuntu/Settings/Fingerprint/StatusLabel.qml (+84/-0) plugins/Ubuntu/Settings/Fingerprint/assets.qrc (+11/-0) plugins/Ubuntu/Settings/Fingerprint/assets/fingerprint_boxes.json (+1/-0) plugins/Ubuntu/Settings/Fingerprint/assets/shape-down@27.sci (+7/-0) plugins/Ubuntu/Settings/Fingerprint/assets/shape-up@27.sci (+7/-0) plugins/Ubuntu/Settings/Fingerprint/plugin.cpp (+35/-0) plugins/Ubuntu/Settings/Fingerprint/plugin.h (+30/-0) plugins/Ubuntu/Settings/Fingerprint/qmldir (+7/-0) plugins/Ubuntu/Settings/Fingerprint/ubuntusettingsfingerprint.cpp (+39/-0) plugins/Ubuntu/Settings/Fingerprint/ubuntusettingsfingerprint.h (+37/-0) plugins/Ubuntu/Settings/Fingerprint/utils/segment.py (+84/-0) po/ubuntu-settings-components.pot (+101/-16) tests/qmltests/CMakeLists.txt (+7/-0) tests/qmltests/Fingerprint/tst_FingerprintNames.qml (+364/-0) tests/qmltests/Fingerprint/tst_FingerprintSetup.qml (+236/-0) tests/qmltests/Fingerprint/tst_FingerprintVisual.qml (+132/-0) tests/qmltests/Fingerprint/tst_Fingerprints.qml (+230/-0) tests/qmltests/mocks/Biometryd/CMakeLists.txt (+20/-0) tests/qmltests/mocks/Biometryd/MockDevice.cpp (+30/-0) tests/qmltests/mocks/Biometryd/MockDevice.h (+38/-0) tests/qmltests/mocks/Biometryd/MockFingerprintReader.cpp (+49/-0) tests/qmltests/mocks/Biometryd/MockFingerprintReader.h (+65/-0) tests/qmltests/mocks/Biometryd/MockObserver.cpp (+88/-0) tests/qmltests/mocks/Biometryd/MockObserver.h (+52/-0) tests/qmltests/mocks/Biometryd/MockOperation.cpp (+34/-0) tests/qmltests/mocks/Biometryd/MockOperation.h (+36/-0) tests/qmltests/mocks/Biometryd/MockService.cpp (+42/-0) tests/qmltests/mocks/Biometryd/MockService.h (+46/-0) tests/qmltests/mocks/Biometryd/MockTemplateStore.cpp (+56/-0) tests/qmltests/mocks/Biometryd/MockTemplateStore.h (+86/-0) tests/qmltests/mocks/Biometryd/MockUser.cpp (+33/-0) tests/qmltests/mocks/Biometryd/MockUser.h (+38/-0) tests/qmltests/mocks/Biometryd/plugin.cpp (+60/-0) tests/qmltests/mocks/Biometryd/plugin.h (+31/-0) tests/qmltests/mocks/Biometryd/qmldir (+2/-0) tests/qmltests/mocks/CMakeLists.txt (+32/-0) tests/qmltests/mocks/GSettings.1.0/CMakeLists.txt (+20/-0) tests/qmltests/mocks/GSettings.1.0/fake_gsettings.cpp (+124/-0) tests/qmltests/mocks/GSettings.1.0/fake_gsettings.h (+101/-0) tests/qmltests/mocks/GSettings.1.0/plugin.cpp (+33/-0) tests/qmltests/mocks/GSettings.1.0/plugin.h (+31/-0) tests/qmltests/mocks/GSettings.1.0/qmldir (+2/-0) |
To merge this branch: | bzr merge lp://qastaging/~jonas-drange/ubuntu-settings-components/fingerprint |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Registry Administrators | Pending | ||
Review via email:
|
Commit message
components for allowing a user to manage fingerprints
Description of the change
* Are there any related MPs required for this MP to build/function as expected? Please list.
Yes, fingerprint bindings.
* Did you perform an exploratory manual test run of your code change and any related functionality?
TBD
* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A
* If you changed the UI, has there been a design review?
TBD
* If you changed localized strings, has the POT file been updated?
TBD
Rationale: https:/
Unmerged revisions
- 162. By Jonas G. Drange
-
update pot
- 161. By Jonas G. Drange
-
refactor tests, and add the last piece of the naming
- 160. By Jonas G. Drange
-
first part of named templates
- 159. By Jonas G. Drange
-
start working on name story
- 158. By Jonas G. Drange
-
complete directionvisual
- 157. By Jonas G. Drange
-
first stab at smart rotation
- 156. By Jonas G. Drange
-
have failed and success screens on same page
- 155. By Jonas G. Drange
-
fix some design issues
- 154. By Jonas G. Drange
-
size op only on available
- 153. By Jonas G. Drange
-
update pot