Merge lp:~cimi/ubuntu-system-settings/wizard.privacy into lp:ubuntu-system-settings

Proposed by Andrea Cimitan
Status: Work in progress
Proposed branch: lp:~cimi/ubuntu-system-settings/wizard.privacy
Merge into: lp:ubuntu-system-settings
Prerequisite: lp:~unity-team/ubuntu-system-settings/wizard.wifi
Diff against target: 328 lines (+236/-27)
4 files modified
plugins/security-privacy/diagnostics/DiagnosticsCheckEntry.qml (+45/-2)
plugins/security-privacy/diagnostics/PageComponent.qml (+6/-12)
wizard/qml/Components/CheckableSetting.qml (+98/-0)
wizard/qml/Pages/30-phone-settings.qml (+87/-13)
To merge this branch: bzr merge lp:~cimi/ubuntu-system-settings/wizard.privacy
Reviewer Review Type Date Requested Status
Sebastien Bacher (community) Needs Fixing
PS Jenkins bot continuous-integration Approve
Review via email: mp+213124@code.launchpad.net

Commit message

Add phone settings page

Description of the change

Add phone settings page

To post a comment you must log in.
Revision history for this message
Andrea Cimitan (cimi) wrote :

Don't review yet, I'm waiting debs from jenkins

669. By Andrea Cimitan

UI tweaks

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

FAILED: Continuous integration, rev:668
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~cimi/ubuntu-system-settings/wizard.privacy/+merge/213124/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/733/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4314
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3913
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-amd64-ci/249
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/237
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-i386-ci/236
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3737
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4413
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4413/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3915
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3915/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6194
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5319

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/733/rebuild

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

FAILED: Continuous integration, rev:669
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~cimi/ubuntu-system-settings/wizard.privacy/+merge/213124/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/734/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4316
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3915
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-amd64-ci/250
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/238
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-i386-ci/237
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3739
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4415
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4415/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3917
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3917/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6196
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5323

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/734/rebuild

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

FAILED: Continuous integration, rev:670
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~cimi/ubuntu-system-settings/wizard.privacy/+merge/213124/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/736/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4376
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3971
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-amd64-ci/252
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/240
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-i386-ci/239
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3791
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4477
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4477/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3992
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3992/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6242
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5430

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/736/rebuild

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

FAILED: Continuous integration, rev:671
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~cimi/ubuntu-system-settings/wizard.privacy/+merge/213124/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/739/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4385
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3980/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-amd64-ci/255
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/243
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-i386-ci/242
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3798
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4486
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4486/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4001
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4001/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6251/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5439

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/739/rebuild

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

FAILED: Continuous integration, rev:672
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~cimi/ubuntu-system-settings/wizard.privacy/+merge/213124/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/741/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4394
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3989
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-amd64-ci/257
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/245
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-i386-ci/244
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3806
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4495
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4495/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4010
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4010/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6259
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5450

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/741/rebuild

review: Needs Fixing (continuous-integration)
670. By Andrea Cimitan

* Bump version for new package ubuntu-system-settings-wizard
[ Andrea Cimitan ]
* Detect SIM and if negative show no sim page
[ Victor R. Ruiz ]
* Autopilot: Move launch_system_settings to a helper module.
[ Iain Lane ]
* Hide 'Serial' and 'IMEI' entries when the info isn't available
* Don't look for PkgConfig explicitly, breaks with Multi-Arch.
  FindPkgConfig.cmake does this for us anyway.
[ CI bot ]
* Resync trunk
[ Diego Sarmentero ]
* Add click updates support. .

671. By Andrea Cimitan

More merges

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

What's the status of this one? Should it be reviewed? We should clean the backlog and unblock the wizard changes

672. By Andrea Cimitan

Merged wifi

673. By Andrea Cimitan

[ Mathieu Trudel-Lapierre ]
* Implement discoverability and some bluetooth fixes: -
  Discoverability: make the system visible to other bluetooth devices
  - Trusted: when successfully paired and connected, mark device as
  Trusted so it can automatically connect again. - Connect the Audio
  interface for all audio devices, including Headsets. Some bluetooth
  audio devices that don't contain a microphone still show up as
  Headsets, and won't connect successfully otherwise. This will still
  work for standard headsets, since Audio connects all audio
  interfaces. - Stop discovery when a device is selected for
  connection, and it sometimes causes connection attempts to fail.
  (LP: #1268047)
[ Michael Terry ]
* Add Wi-Fi support to the system settings wizard
* Correctly set up language variables before unity8 runs the first time
[ Iain Lane ]
* When connecting to whoopsie-preferences on the bus, don't require
  the interface to be valid. It won't be when the service has exited.
[ Mathieu Trudel-Lapierre ]
* Enable devices other than headsets: headphones and generic audio devices,
  and make the strings referring to headset more generic.
[ jonas-drange ]
* Rewrite "Keyboard sound" component in "Sound" panel to use
  "LanguagePlugin" which provides means to toggle keyboard sound
  setting.
[ Iain Lane ]
* time-date: Don't try to search while the model is building. Display
  an ActivityIndicator when searching while constructing the model to
  avoid confusing message. (LP: #1326475)
* Make time-date tests more robust in the face of things taking a
  while to complete. (LP: #1329245)
[ Michael Terry ]
* Use XDG_GREETER_DATA_DIR to store background files in a folder that
  the greeter can also read. This fixes the recent regression in not
  being able to choose a ContentHub file for the welcome screen. (LP:
  #1325505)
[ Iain Lane ]
* Inline setUpImages(), otherwise the function call doesn't do
  anything.
[ Brendan Donegan ]
* Make test_tz_list_initially_empty more robust by using
  wait_select_single instead of select_single to get the label. (LP:
  #1319711)
[ Ken VanDine ]
* Use the new header design. There is currently only one page in USS
  that includes a toolbar action, the background panel has a button to
  import photos from gallery. It works well with the new header.
[ CI bot ]
* Resync trunk
[ Diego Sarmentero ]
* Not dismiss Credentials warning with other messages. .
[ Brendan Donegan ]
* Add test for Check for Updates button and fix search test cases,
  plus add a new one for searches that shouldn't find anything.
* Get vendor and model from dmi on desktops for test_hardware_name
[ Brendan Donegan ]
* Change the coverage filter in CMakeLists.txt from test to tests, to
  match the directory name
[ Victor R. Ruiz ]
* Autopilot test refactoring: add emulators and helpers.
[ Diego Sarmentero ]
* Fix linking property to non-notifyable attribute .
* Show click updates notifications in main page. (LP: #1307993)
* Loading updates page using loadPluginByName to avoid blank page
  issue. (LP: #1308162)
[ Iain Lane ]
* Improve performance of the time zone location selection search by
  doing more work in the background
* Renaming dep package qtdeclarative5-qtmultimedia-plugin to
  qml-module-qtmultimedia
[ Diego Sarmentero ]
* Avoid duplicate result of Image upadte. Don't ask for credentials on
  Image update (LP: #1301644)
* Ignore real updates during autopilot tests (LP: #1281582)
[ Iain Lane ]
* Disable the data roaming switch and set it to false if data is off
  (LP: #1287260)
[ Ricardo Salveti de Araujo ]
* brightness.cpp: updating code to reflect latest powerd dbus API
  changes. debian/control: depend on latest powerd .
* debian/control: alternatively depend on the OpenGLES version of
  qtdeclarative5-qtmultimedia-plugin and
  qtdeclarative5-ubuntu-ui-toolkit-plugin
[ Ken VanDine ]
* system-update: Fix the flickable bounds behavior so it doesn't
  overshoot when the contentHeight is shorter than the view.
* fixed some deprecations in ListItems, iconSource instead of icon
[ Sebastien Bacher ]
* build the lists of devices before connecting the signals, that
  avoids warning
[ Iain Lane ]
* [time-date] Cache the results so that we can search within a
  narrower set
* Fix click package update checking and update available/not available
  signal emission. (LP: #1306569)
[ Omer Akram ]
* autopilot tests improvements: * Improved existing tests to compare
  values with backends instead of just testing the 'item' is there. *
  Fixed a skipped failing test * Delete label tests and those which
  are trying to make sure certain elements exist. (LP: #1301214)
[ Michael Terry ]
* Fix click package update checking and update available/not available
  signal emission. (LP: #1306569)

674. By Andrea Cimitan

Text fixes

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

FAILED: Continuous integration, rev:673
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/896/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1191
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1057
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/88
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/88
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/88/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/88
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1531
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2064
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2064/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8836
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/881
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1200
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1200/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/896/rebuild

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

PASSED: Continuous integration, rev:674
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/898/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1201
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1066
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/90
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/90
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/90/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/90
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1537
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2076
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2076/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8845
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/886
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1209
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1209/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/898/rebuild

review: Approve (continuous-integration)
Revision history for this message
Michael Terry (mterry) wrote :

Here is the latest design mockup for that screen:
https://drive.google.com/a/canonical.com/file/d/0B5f4BIFN7TDwNEhSWTlabmI3SVNtalFnY1I3QkZTRGhjRkpN/edit?usp=sharing

It doesn't even include the notice about uploading errors to Ubuntu anymore. I also emailed you the rest of the screens in the latest design refresh.

What do you want to do about these? What is the problem with the backend for locations? They don't work at all or they don't work some of the time or some such?

Revision history for this message
Sebastien Bacher (seb128) wrote :

Could you reply to Michael's comment?

I've also added a not about a string issue

review: Needs Fixing
Revision history for this message
Sebastien Bacher (seb128) wrote :

not->note

Revision history for this message
Andrea Cimitan (cimi) wrote :

> Here is the latest design mockup for that screen:
> https://drive.google.com/a/canonical.com/file/d/0B5f4BIFN7TDwNEhSWTlabmI3SVNta
> lFnY1I3QkZTRGhjRkpN/edit?usp=sharing
>
> It doesn't even include the notice about uploading errors to Ubuntu anymore.
> I also emailed you the rest of the screens in the latest design refresh.
>
> What do you want to do about these? What is the problem with the backend for
> locations? They don't work at all or they don't work some of the time or some
> such?
The change seems to be disconnected and not saved across the settings. It's like not saving at all

Revision history for this message
Sebastien Bacher (seb128) wrote :

What's the status of those changes? There is a least a comment from the previous reviews to fix. Do you still plan to work on getting the changeset ready?

review: Needs Information
Revision history for this message
Sebastien Bacher (seb128) wrote :

Changing to "work in progress", that needs at least to be rebased on trunk

review: Needs Fixing

Unmerged revisions

674. By Andrea Cimitan

Text fixes

673. By Andrea Cimitan

[ Mathieu Trudel-Lapierre ]
* Implement discoverability and some bluetooth fixes: -
  Discoverability: make the system visible to other bluetooth devices
  - Trusted: when successfully paired and connected, mark device as
  Trusted so it can automatically connect again. - Connect the Audio
  interface for all audio devices, including Headsets. Some bluetooth
  audio devices that don't contain a microphone still show up as
  Headsets, and won't connect successfully otherwise. This will still
  work for standard headsets, since Audio connects all audio
  interfaces. - Stop discovery when a device is selected for
  connection, and it sometimes causes connection attempts to fail.
  (LP: #1268047)
[ Michael Terry ]
* Add Wi-Fi support to the system settings wizard
* Correctly set up language variables before unity8 runs the first time
[ Iain Lane ]
* When connecting to whoopsie-preferences on the bus, don't require
  the interface to be valid. It won't be when the service has exited.
[ Mathieu Trudel-Lapierre ]
* Enable devices other than headsets: headphones and generic audio devices,
  and make the strings referring to headset more generic.
[ jonas-drange ]
* Rewrite "Keyboard sound" component in "Sound" panel to use
  "LanguagePlugin" which provides means to toggle keyboard sound
  setting.
[ Iain Lane ]
* time-date: Don't try to search while the model is building. Display
  an ActivityIndicator when searching while constructing the model to
  avoid confusing message. (LP: #1326475)
* Make time-date tests more robust in the face of things taking a
  while to complete. (LP: #1329245)
[ Michael Terry ]
* Use XDG_GREETER_DATA_DIR to store background files in a folder that
  the greeter can also read. This fixes the recent regression in not
  being able to choose a ContentHub file for the welcome screen. (LP:
  #1325505)
[ Iain Lane ]
* Inline setUpImages(), otherwise the function call doesn't do
  anything.
[ Brendan Donegan ]
* Make test_tz_list_initially_empty more robust by using
  wait_select_single instead of select_single to get the label. (LP:
  #1319711)
[ Ken VanDine ]
* Use the new header design. There is currently only one page in USS
  that includes a toolbar action, the background panel has a button to
  import photos from gallery. It works well with the new header.
[ CI bot ]
* Resync trunk
[ Diego Sarmentero ]
* Not dismiss Credentials warning with other messages. .
[ Brendan Donegan ]
* Add test for Check for Updates button and fix search test cases,
  plus add a new one for searches that shouldn't find anything.
* Get vendor and model from dmi on desktops for test_hardware_name
[ Brendan Donegan ]
* Change the coverage filter in CMakeLists.txt from test to tests, to
  match the directory name
[ Victor R. Ruiz ]
* Autopilot test refactoring: add emulators and helpers.
[ Diego Sarmentero ]
* Fix linking property to non-notifyable attribute .
* Show click updates notifications in main page. (LP: #1307993)
* Loading updates page using loadPluginByName to avoid blank page
  issue. (LP: #1308162)
[ Iain Lane ]
* Improve performance of the time zone location selection search by
  doing more work in the background
* Renaming dep package qtdeclarative5-qtmultimedia-plugin to
  qml-module-qtmultimedia
[ Diego Sarmentero ]
* Avoid duplicate result of Image upadte. Don't ask for credentials on
  Image update (LP: #1301644)
* Ignore real updates during autopilot tests (LP: #1281582)
[ Iain Lane ]
* Disable the data roaming switch and set it to false if data is off
  (LP: #1287260)
[ Ricardo Salveti de Araujo ]
* brightness.cpp: updating code to reflect latest powerd dbus API
  changes. debian/control: depend on latest powerd .
* debian/control: alternatively depend on the OpenGLES version of
  qtdeclarative5-qtmultimedia-plugin and
  qtdeclarative5-ubuntu-ui-toolkit-plugin
[ Ken VanDine ]
* system-update: Fix the flickable bounds behavior so it doesn't
  overshoot when the contentHeight is shorter than the view.
* fixed some deprecations in ListItems, iconSource instead of icon
[ Sebastien Bacher ]
* build the lists of devices before connecting the signals, that
  avoids warning
[ Iain Lane ]
* [time-date] Cache the results so that we can search within a
  narrower set
* Fix click package update checking and update available/not available
  signal emission. (LP: #1306569)
[ Omer Akram ]
* autopilot tests improvements: * Improved existing tests to compare
  values with backends instead of just testing the 'item' is there. *
  Fixed a skipped failing test * Delete label tests and those which
  are trying to make sure certain elements exist. (LP: #1301214)
[ Michael Terry ]
* Fix click package update checking and update available/not available
  signal emission. (LP: #1306569)

672. By Andrea Cimitan

Merged wifi

671. By Andrea Cimitan

More merges

670. By Andrea Cimitan

* Bump version for new package ubuntu-system-settings-wizard
[ Andrea Cimitan ]
* Detect SIM and if negative show no sim page
[ Victor R. Ruiz ]
* Autopilot: Move launch_system_settings to a helper module.
[ Iain Lane ]
* Hide 'Serial' and 'IMEI' entries when the info isn't available
* Don't look for PkgConfig explicitly, breaks with Multi-Arch.
  FindPkgConfig.cmake does this for us anyway.
[ CI bot ]
* Resync trunk
[ Diego Sarmentero ]
* Add click updates support. .

669. By Andrea Cimitan

UI tweaks

668. By Andrea Cimitan

Phone settings page

667. By Andrea Cimitan

Merged wifi branch

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/security-privacy/diagnostics/DiagnosticsCheckEntry.qml'
2--- plugins/security-privacy/diagnostics/DiagnosticsCheckEntry.qml 2013-07-26 11:12:18 +0000
3+++ plugins/security-privacy/diagnostics/DiagnosticsCheckEntry.qml 2014-06-25 11:08:21 +0000
4@@ -23,9 +23,10 @@
5 import Ubuntu.Components.ListItems 0.1 as ListItem
6
7 ListItem.Base {
8+ id: listItem
9+
10 property string textEntry: "";
11- property alias checked: checkBox.checked;
12- onClicked: checked = !checked;
13+ property bool checked: false
14
15 Row {
16 anchors.top: parent.top
17@@ -34,7 +35,49 @@
18
19 CheckBox {
20 id: checkBox
21+
22+ property bool enableCheckConnection: true
23+
24 anchors.verticalCenter: parent.verticalCenter
25+
26+ Component.onCompleted: {
27+ enableCheckConnection = false;
28+ checked = listItem.checked;
29+ enableCheckConnection = true;
30+ }
31+
32+ // FIXME : should use Checkbox.toggled signal
33+ // lp:~nick-dedekind/ubuntu-ui-toolkit/checkbox.toggled
34+ onCheckedChanged: {
35+ if (!enableCheckConnection) return;
36+
37+ var oldEnable = enableCheckConnection;
38+ enableCheckConnection = false;
39+
40+ listItem.checked = checked;
41+ listItem.triggered(listItem.checked);
42+
43+ enableCheckConnection = oldEnable;
44+ }
45+
46+ Connections {
47+ target: listItem
48+ onCheckedChanged: {
49+ if (!checkBox.enableCheckConnection) return;
50+
51+ var oldEnable = checkBox.enableCheckConnection;
52+ checkBox.enableCheckConnection = false;
53+
54+ checkBox.checked = listItem.checked;
55+
56+ checkBox.enableCheckConnection = oldEnable;
57+ }
58+ }
59+
60+ Connections {
61+ target: listItem.__mouseArea
62+ onClicked: checkBox.clicked();
63+ }
64 }
65 Label {
66 anchors.verticalCenter: parent.verticalCenter
67
68=== modified file 'plugins/security-privacy/diagnostics/PageComponent.qml'
69--- plugins/security-privacy/diagnostics/PageComponent.qml 2013-07-29 15:04:03 +0000
70+++ plugins/security-privacy/diagnostics/PageComponent.qml 2014-06-25 11:08:21 +0000
71@@ -32,10 +32,6 @@
72
73 UbuntuDiagnostics {
74 id: diagnosticsWidget
75- function maybeUpdate() {
76- reportCrashesCheck.checked = diagnosticsWidget.canReportCrashes
77- }
78- onReportCrashesChanged: maybeUpdate()
79 }
80 Flickable {
81 id: scrollWidget
82@@ -61,16 +57,14 @@
83
84 DiagnosticsCheckEntry {
85 id: reportCrashesCheck
86+
87+ property bool serverValue: diagnosticsWidget.canReportCrashes
88+
89 checked: diagnosticsWidget.canReportCrashes
90- onCheckedChanged: {
91- diagnosticsWidget.canReportCrashes = checked;
92- /* Confirm the setting stuck and reflect it in the UI. */
93- if (checked != diagnosticsWidget.canReportCrashes) {
94- checked = !checked;
95- }
96-
97- }
98 textEntry: i18n.tr("App crashes and errors")
99+
100+ onServerValueChanged: checked = serverValue
101+ onTriggered: diagnosticsWidget.canReportCrashes = checked
102 }
103
104 ListItem.SingleValue {
105
106=== added file 'wizard/qml/Components/CheckableSetting.qml'
107--- wizard/qml/Components/CheckableSetting.qml 1970-01-01 00:00:00 +0000
108+++ wizard/qml/Components/CheckableSetting.qml 2014-06-25 11:08:21 +0000
109@@ -0,0 +1,98 @@
110+/*
111+ * Copyright (C) 2014 Canonical, Ltd.
112+ *
113+ * This program is free software; you can redistribute it and/or modify
114+ * it under the terms of the GNU General Public License as published by
115+ * the Free Software Foundation; version 3.
116+ *
117+ * This program is distributed in the hope that it will be useful,
118+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
119+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
120+ * GNU General Public License for more details.
121+ *
122+ * You should have received a copy of the GNU General Public License
123+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
124+ */
125+
126+import QtQuick 2.0
127+import QMenuModel 0.1
128+import Ubuntu.Components 0.1
129+import Ubuntu.Components.ListItems 0.1 as ListItem
130+
131+ListItem.Empty {
132+ id: listItem
133+
134+ property alias text: label.text
135+ property bool checked: false
136+ property real leftMargin
137+ property real rightMargin
138+
139+ implicitHeight: label.height + units.gu(2)
140+
141+ Item {
142+ anchors.fill: parent
143+
144+ CheckBox {
145+ id: checkBox
146+
147+ property bool enableCheckConnection: true
148+
149+ anchors {
150+ left: parent.left
151+ verticalCenter: parent.verticalCenter
152+ leftMargin: listItem.leftMargin
153+ }
154+
155+ Component.onCompleted: {
156+ enableCheckConnection = false;
157+ checked = listItem.checked;
158+ enableCheckConnection = true;
159+ }
160+
161+ // FIXME : should use Checkbox.toggled signal
162+ // lp:~nick-dedekind/ubuntu-ui-toolkit/checkbox.toggled
163+ onCheckedChanged: {
164+ if (!enableCheckConnection) return;
165+
166+ var oldEnable = enableCheckConnection;
167+ enableCheckConnection = false;
168+
169+ listItem.checked = checked;
170+ listItem.triggered(listItem.checked);
171+
172+ enableCheckConnection = oldEnable;
173+ }
174+
175+ Connections {
176+ target: listItem
177+ onCheckedChanged: {
178+ if (!checkBox.enableCheckConnection) return;
179+
180+ var oldEnable = checkBox.enableCheckConnection;
181+ checkBox.enableCheckConnection = false;
182+
183+ checkBox.checked = listItem.checked;
184+
185+ checkBox.enableCheckConnection = oldEnable;
186+ }
187+ }
188+
189+ Connections {
190+ target: listItem.__mouseArea
191+ onClicked: checkBox.clicked();
192+ }
193+ }
194+
195+ Label {
196+ id: label
197+ anchors {
198+ left: checkBox.right
199+ right: parent.right
200+ verticalCenter: parent.verticalCenter
201+ leftMargin: units.gu(2)
202+ rightMargin: listItem.rightMargin
203+ }
204+ wrapMode: Text.WordWrap
205+ }
206+ }
207+}
208
209=== renamed file 'wizard/qml/Pages/30-location.qml' => 'wizard/qml/Pages/30-phone-settings.qml'
210--- wizard/qml/Pages/30-location.qml 2014-03-19 17:48:48 +0000
211+++ wizard/qml/Pages/30-phone-settings.qml 2014-06-25 11:08:21 +0000
212@@ -15,30 +15,104 @@
213 */
214
215 import QtQuick 2.0
216+import QMenuModel 0.1
217 import Ubuntu.Components 0.1
218+import Ubuntu.Components.ListItems 0.1 as ListItem
219+import Ubuntu.SystemSettings.Diagnostics 1.0
220 import "../Components" as LocalComponents
221
222 LocalComponents.Page {
223+ id: userSettingsPage
224 title: i18n.tr("Phone settings")
225 forwardButtonSourceComponent: forwardButton
226
227+ UbuntuDiagnostics {
228+ id: diagnosticsWidget
229+ }
230+
231 Item {
232 id: content
233 anchors {
234 fill: parent
235- topMargin: topMargin
236- leftMargin: leftMargin
237- rightMargin: rightMargin
238- bottomMargin: bottomMargin
239- }
240-
241- Label {
242- width: parent.width
243- wrapMode: Text.WordWrap
244- fontSize: "large"
245- text: i18n.tr("Your phone is setup to automatically report errors to Canonical. This can be disabled in system settings.") +
246- "\n\n" +
247- i18n.tr("Your phone is setup to detect your location. This can be disabled in system settings.")
248+ bottomMargin: userSettingsPage.bottomMargin
249+ }
250+
251+ QDBusActionGroup {
252+ id: locationActionGroup
253+ busType: DBus.SessionBus
254+ busName: "com.canonical.indicator.location"
255+ objectPath: "/com/canonical/indicator/location"
256+
257+ property variant enabled: action("location-detection-enabled")
258+
259+ Component.onCompleted: start()
260+ }
261+
262+ Binding {
263+ target: locationOn
264+ property: "checked"
265+ value: locationActionGroup.enabled.state
266+ }
267+
268+ Column {
269+ anchors.fill: parent
270+
271+ LocalComponents.SectionHeader {
272+ id: userExperienceSectionHeader
273+ width: parent.width
274+ leftMargin: userSettingsPage.leftMargin
275+ rightMargin: userSettingsPage.rightMargin
276+ text: i18n.tr("User experience")
277+ }
278+
279+ LocalComponents.CheckableSetting {
280+ id: reportCrashesCheck
281+
282+ property bool serverValue: diagnosticsWidget.canReportCrashes
283+
284+ leftMargin: userSettingsPage.leftMargin
285+ rightMargin: userSettingsPage.rightMargin
286+ checked: diagnosticsWidget.canReportCrashes
287+ text: i18n.tr("Your phone is set up to automatically report errors to Canonical. This can be disabled in system settings.")
288+
289+ onServerValueChanged: checked = serverValue
290+ onTriggered: diagnosticsWidget.canReportCrashes = checked
291+ }
292+
293+ LocalComponents.SectionHeader {
294+ id: locationServicesSectionHeader
295+ width: parent.width
296+ leftMargin: userSettingsPage.leftMargin
297+ rightMargin: userSettingsPage.rightMargin
298+ text: i18n.tr("Location services")
299+ }
300+
301+ ListItem.Empty {
302+ width: parent.width
303+
304+ Label {
305+ id: label
306+ anchors {
307+ verticalCenter: parent.verticalCenter
308+ left: parent.left
309+ right: parent.right
310+ leftMargin: userSettingsPage.leftMargin
311+ rightMargin: userSettingsPage.rightMargin
312+ }
313+ wrapMode: Text.WordWrap
314+ text: i18n.tr("Your phone is set up to detect your location. This can be disabled in system settings.")
315+ }
316+ }
317+
318+ /* When location services will actually work.
319+ LocalComponents.CheckableSetting {
320+ id: locationOn
321+ leftMargin: userSettingsPage.leftMargin
322+ rightMargin: userSettingsPage.rightMargin
323+ text: i18n.tr("Your phone is setup to detect your location. This can be disabled in system settings.")
324+ checked: locationActionGroup.enabled.state
325+ onClicked: locationActionGroup.enabled.activate()
326+ } */
327 }
328 }
329

Subscribers

People subscribed via source and target branches