Merge lp:~saviq/ubuntu-ui-toolkit/suru-switch into lp:ubuntu-ui-toolkit

[Michał Sawicz]

* Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~saviq/ubuntu-ui-toolkit/fix-pep8/+merge/225135
https://code.launchpad.net/~unity-team/unity8/suru-switch/+merge/207991

* 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?
Not yet, waiting for packages from silo.

* Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/ui-toolkit) on device or emulator?
Not yet, waiting for packages from silo.

* If you changed the UI, was the change specified/approved by design?
Yes, this requirement comes from design.

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

[Sebastien Bacher (seb128)]

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:978
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1901/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3973
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3558
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/849
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/849
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/849/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3468
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4008
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4008/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3560
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3560/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5892
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4848

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1901/rebuild

review: Approve (continuous-integration)

[Tim Peeters (tpeeters)]

code looks fine, but we need to wait for the suru icons to land in an image and run ci@home.

review: Approve

[Tim Peeters (tpeeters)]

The documentation of various components with an iconName property states that we use the ubuntu-mobile theme. Please update these as well:

tim@ideapad:~/dev/ubuntu-ui-toolkit/trunk$ grep ubuntu-mobile `find . -name "*.qml"`
./modules/Ubuntu/Components/ActionItem.qml: The icon associated with the actionItem in the ubuntu-mobile icon theme.
./modules/Ubuntu/Components/Action.qml: This is the name of the icon in the ubuntu-mobile theme.
./modules/Ubuntu/Components/Action.qml: \li Ubuntu Touch: \l file:/usr/share/icons/ubuntu-mobile
./modules/Ubuntu/Components/OptionSelectorDelegate.qml: \li Ubuntu Touch: \l file:/usr/share/icons/ubuntu-mobile
./modules/Ubuntu/Components/ListItems/Standard.qml: \li Ubuntu Touch: \l file:/usr/share/icons/ubuntu-mobile
./modules/Ubuntu/Components/ListItems/Standard.qml: \li Ubuntu Touch: \l file:/usr/share/icons/ubuntu-mobile
./modules/Ubuntu/Components/ListItems/Base.qml: \li Ubuntu Touch: \l file:/usr/share/icons/ubuntu-mobile
./modules/Ubuntu/Components/ListItems/Base.qml: \li Ubuntu Touch: \l file:/usr/share/icons/ubuntu-mobile
./modules/Ubuntu/Components/ListItems/ValueSelector.qml: \li Ubuntu Touch: \l file:/usr/share/icons/ubuntu-mobile
./modules/Ubuntu/Components/ListItems/ValueSelector.qml: \li Ubuntu Touch: \l file:/usr/share/icons/ubuntu-mobile
./modules/Ubuntu/Components/Icon.qml: \li Ubuntu Touch: \l file:/usr/share/icons/ubuntu-mobile

review: Needs Fixing

[Cris Dywan (kalikiana)]

ci@home http://paste.ubuntu.com/7127247/ image 249 - plenty failures though I doubt they're all icon-related.

[Michał Sawicz (saviq)]

On 20.03.2014 20:00, Tim Peeters wrote:
> The documentation of various components with an iconName property states that we use the ubuntu-mobile theme. Please update these as well:

That's pretty broken, IMO, it should just say "from the icon theme", and
in just one place mention the current default. But that might as well be
done when you allow overriding the theme.

Updated.

[Cris Dywan (kalikiana)]

This may be due to the theme change:

20:37:28.313 ERROR test_notifications:291 - Notification process wasn't killed, killing now.
20:37:29.743 ERROR testresult:45 - ERROR: unity8.shell.tests.test_notifications.InteractiveNotificationBase.test_sd_incoming_call(Native Device)
20:37:29.744 ERROR testresult:45 - traceback-2: {{{
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/autopilot/utilities.py", line 335, in action_on_test_end
    obj.on_test_end(test_instance)
  File "/usr/lib/python2.7/dist-packages/autopilot/input/_X11.py", line 493, in on_test_end
    move_mouse_to_screen(0)
  File "/usr/lib/python2.7/dist-packages/autopilot/display/__init__.py", line 59, in move_mouse_to_screen
    Mouse.create().move(x, y, False)
  File "/usr/lib/python2.7/dist-packages/autopilot/input/__init__.py", line 293, in create
}}}
20:37:29.746 ERROR testresult:45 - traceback: {{{
Traceback (most recent call last):
  File "/home/phablet/autopilot/unity8/shell/tests/test_notifications.py", line 199, in test_sd_incoming_call
    self._assert_notification(notification, None, None, True, True, 1.0)
  File "/home/phablet/autopilot/unity8/shell/tests/test_notifications.py", line 96, in _assert_notification
    self.assertThat(notification.iconSource, Eventually(NotEquals("")))
  File "/usr/lib/python2.7/dist-packages/testtools/testcase.py", line 406, in assertThat
    raise mismatch_error
MismatchError: After 10.0 seconds test on Notification.iconSource failed: u'' == dbus.String(u'', variant_level=1)
}}}

[Michał Sawicz (saviq)]

On 20.03.2014 22:22, Christian Dywan wrote:
> This may be due to the theme change:

> MismatchError: After 10.0 seconds test on Notification.iconSource failed: u'' == dbus.String(u'', variant_level=1)

What image are the tests ran on? We have this issue fixed in unity8
version 7.84+14.04.20140317.2-0ubuntu1.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:979
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1926/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4137
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3721
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/874
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/874
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/874/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3603
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4199
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4199/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3723
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3723/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6031
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5063

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1926/rebuild

review: Approve (continuous-integration)

[Tim Peeters (tpeeters)]

I am not getting the unity8 failures. I ran tests yesterday for a different MR with image 249, and unity8 AP tests passed. Now I tested with http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/874/artifact/work/output/*zip*/output.zip and image 250, and all unity8 tests pass: http://paste.ubuntu.com/7130114/

[Tim Peeters (tpeeters)]

did you do manual testing on the device?

I just noticed that the icons in the status bar became slightly bigger, and there is no spacing inbetween them - looks ugly.

review: Needs Fixing

[Tim Peeters (tpeeters)]

Tested music-app, all OK: http://paste.ubuntu.com/7130220/

Tested system-settings: http://paste.ubuntu.com/7130184/ one failure:
11:45:42.878 ERROR testresult:46 - ERROR: ubuntu_system_settings.tests.test_about.StorageTestCase.test_storage_page(with touch)

2nd try system-settings: http://paste.ubuntu.com/7130289/
A lot of tests fail here, including:
12:13:53.225 ERROR testresult:46 - ERROR: ubuntu_system_settings.tests.test_about.AboutTestCase.test_imei(with touch)
12:14:58.567 ERROR testresult:46 - ERROR: ubuntu_system_settings.tests.test_cellular.CellularTestCase.test_current_network(with touch)
12:15:14.834 ERROR testresult:46 - ERROR: ubuntu_system_settings.tests.test_about.StorageTestCase.test_disk(with touch)
12:15:49.085 ERROR testresult:46 - ERROR: ubuntu_system_settings.tests.test_plugins.SystemSettingsTestCases.test_background_plugin(with touch)
12:16:05.161 ERROR testresult:46 - ERROR: ubuntu_system_settings.tests.test_plugins.SystemSettingsTestCases.test_cellular_plugin(with touch)

[Tim Peeters (tpeeters)]

after rebooting, ubuntu_system_settings CI@home all OK: http://paste.ubuntu.com/7131156/

[Michał Sawicz (saviq)]

So, can we have top-ACK for this?

[Tim Peeters (tpeeters)]

Another CI@home run: http://paste.ubuntu.com/7151431/ (image 259)
- Lots of failures in UITK
- music_app, clock_app, calculator, file manager, weather: OK
- dialer, messaging FAILURES
- mediaplayer, online accounts OK
- system settings FAILURES

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:981
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1950/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4236
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3820
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/898
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/898
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/898/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3674
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4310
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4310/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3822
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3822/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6111
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5189

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1950/rebuild

review: Approve (continuous-integration)

[Tim Peeters (tpeeters)]

Please update the icon path also in our uitk-gallery, after this MR lands: https://code.launchpad.net/~kalikiana/ubuntu-ui-toolkit/demoIcons/+merge/217433

And please re-submit the MR to merge to lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/staging

review: Needs Fixing

[Michał Sawicz (saviq)]

Merged trunk, updated the remaining ubuntu-mobile references.

[Michał Sawicz (saviq)]

This is now available in silo 004.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:983
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2096/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1374/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1199/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-amd64-ci/42/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-armhf-ci/42/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2311/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1342/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2096/rebuild

review: Needs Fixing (continuous-integration)

[Tim Peeters (tpeeters)]

Code looks good

review: Approve

[Tim Peeters (tpeeters)]

good, if CI likes it also

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:983
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2097/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1401/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1211/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-amd64-ci/43/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-armhf-ci/43/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2350/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1357/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2097/rebuild

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

Ugh, forgot to push the pep8 merge.

[Tim Peeters (tpeeters)]

ok

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:985
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2099/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1418
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1222
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-amd64-ci/45
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-armhf-ci/45
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-armhf-ci/45/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1714
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2371
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2371/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9106
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1006
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1368
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1368/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2099/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2014-06-19 06:55:24 +0000
+++ debian/changelog	2014-07-01 15:27:51 +0000
@@ -1,3 +1,9 @@
+ubuntu-ui-toolkit (0.1.48-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Bump version to indicate requirement for new theme icons.
+
+ -- Michał Sawicz <[e-mail]>  Tue, 25 Mar 2014 16:11:47 +0100
+
 ubuntu-ui-toolkit (0.1.47+14.10.20140619-0ubuntu1) utopic; urgency=low
 
   [ Ubuntu daily release ]

=== modified file 'debian/control'
--- debian/control	2014-05-25 13:09:20 +0000
+++ debian/control	2014-07-01 15:27:51 +0000
@@ -56,6 +56,7 @@
          qtdeclarative5-window-plugin,
          qtdeclarative5-qtfeedback-plugin,
          qtdeclarative5-unity-action-plugin (>= 1.1.0),
+         suru-icon-theme,
          ttf-ubuntu-font-family,
          ubuntu-ui-toolkit-theme,
          ${misc:Depends},

=== modified file 'examples/ubuntu-ui-toolkit-gallery/Icons.qml'
--- examples/ubuntu-ui-toolkit-gallery/Icons.qml	2014-04-28 13:19:08 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Icons.qml	2014-07-01 15:27:51 +0000
@@ -89,7 +89,7 @@
 
                 Repeater {
                     model: FolderListModel {
-                        folder: "/usr/share/icons/ubuntu-mobile/actions/scalable"
+                        folder: "/usr/share/icons/suru/actions/scalable"
                         showDirs: false
                         showOnlyReadable : true
                         sortField: FolderListModel.Name

=== modified file 'modules/Ubuntu/Components/Action.qml'
--- modules/Ubuntu/Components/Action.qml	2014-05-10 20:23:26 +0000
+++ modules/Ubuntu/Components/Action.qml	2014-07-01 15:27:51 +0000
@@ -50,7 +50,7 @@
       The icon associated with the action.
       \qmlproperty string iconName
 
-      This is the name of the icon in the ubuntu-mobile theme.
+      This is the name of the icon in the suru theme.
       If both iconSource and iconName are defined, iconName will be ignored.
 
       Example:
@@ -63,7 +63,7 @@
       \note The complete list of icons available in Ubuntu is not published yet.
             For now please refer to the folder where the icon theme is installed:
             \list
-              \li Ubuntu Touch: \l file:/usr/share/icons/ubuntu-mobile
+              \li Ubuntu Touch: \l file:/usr/share/icons/suru
             \endlist
     */
     property string iconName

=== modified file 'modules/Ubuntu/Components/ActionItem.qml'
--- modules/Ubuntu/Components/ActionItem.qml	2014-04-28 19:24:56 +0000
+++ modules/Ubuntu/Components/ActionItem.qml	2014-07-01 15:27:51 +0000
@@ -60,13 +60,13 @@
     property url iconSource: action ? action.iconSource : (iconName ? "image://theme/" + iconName : "")
 
     /*!
-      The icon associated with the actionItem in the ubuntu-mobile icon theme.
+      The icon associated with the actionItem in the suru icon theme.
       Default value: action.iconName.
 
       \note The complete list of icons available in Ubuntu is not published yet.
             For now please refer to the folders where the icon themes are installed:
             \list
-              \li Ubuntu Touch: \l file:/usr/share/icons/ubuntu-mobile
+              \li Ubuntu Touch: \l file:/usr/share/icons/suru
               \li Ubuntu Desktop: \l file:/usr/share/icons/ubuntu-mono-dark
             \endlist
             These 2 separate icon themes will be merged soon.

=== modified file 'modules/Ubuntu/Components/Icon.qml'
--- modules/Ubuntu/Components/Icon.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/Icon.qml	2014-07-01 15:27:51 +0000
@@ -62,7 +62,7 @@
        \note The complete list of icons available in Ubuntu is not published yet.
            For now please refer to the folders where the icon themes are installed:
            \list
-             \li Ubuntu Touch: \l file:/usr/share/icons/ubuntu-mobile
+             \li Ubuntu Touch: \l file:/usr/share/icons/suru
              \li Ubuntu Desktop: \l file:/usr/share/icons/ubuntu-mono-dark
            \endlist
            These 2 separate icon themes will be merged soon.

=== modified file 'modules/Ubuntu/Components/ListItems/Base.qml'
--- modules/Ubuntu/Components/ListItems/Base.qml	2014-05-27 12:41:49 +0000
+++ modules/Ubuntu/Components/ListItems/Base.qml	2014-07-01 15:27:51 +0000
@@ -60,7 +60,7 @@
       \note The complete list of icons available in Ubuntu is not published yet.
             For now please refer to the folders where the icon themes are installed:
             \list
-              \li Ubuntu Touch: \l file:/usr/share/icons/ubuntu-mobile
+              \li Ubuntu Touch: \l file:/usr/share/icons/suru
               \li Ubuntu Desktop: \l file:/usr/share/icons/ubuntu-mono-dark
             \endlist
             These 2 separate icon themes will be merged soon.

=== modified file 'modules/Ubuntu/Components/ListItems/Standard.qml'
--- modules/Ubuntu/Components/ListItems/Standard.qml	2014-04-28 19:24:56 +0000
+++ modules/Ubuntu/Components/ListItems/Standard.qml	2014-07-01 15:27:51 +0000
@@ -92,7 +92,7 @@
       \note The complete list of icons available in Ubuntu is not published yet.
             For now please refer to the folders where the icon themes are installed:
             \list
-              \li Ubuntu Touch: \l file:/usr/share/icons/ubuntu-mobile
+              \li Ubuntu Touch: \l file:/usr/share/icons/suru
               \li Ubuntu Desktop: \l file:/usr/share/icons/ubuntu-mono-dark
             \endlist
             These 2 separate icon themes will be merged soon.

=== modified file 'modules/Ubuntu/Components/ListItems/ValueSelector.qml'
--- modules/Ubuntu/Components/ListItems/ValueSelector.qml	2014-04-28 19:47:05 +0000
+++ modules/Ubuntu/Components/ListItems/ValueSelector.qml	2014-07-01 15:27:51 +0000
@@ -96,7 +96,7 @@
       \note The complete list of icons available in Ubuntu is not published yet.
             For now please refer to the folders where the icon themes are installed:
             \list
-              \li Ubuntu Touch: \l file:/usr/share/icons/ubuntu-mobile
+              \li Ubuntu Touch: \l file:/usr/share/icons/suru
               \li Ubuntu Desktop: \l file:/usr/share/icons/ubuntu-mono-dark
             \endlist
             These 2 separate icon themes will be merged soon.

=== modified file 'modules/Ubuntu/Components/plugin/unitythemeiconprovider.cpp'
--- modules/Ubuntu/Components/plugin/unitythemeiconprovider.cpp	2014-02-24 18:20:43 +0000
+++ modules/Ubuntu/Components/plugin/unitythemeiconprovider.cpp	2014-07-01 15:27:51 +0000
@@ -23,7 +23,7 @@
 UnityThemeIconProvider::UnityThemeIconProvider():
   QQuickImageProvider(QQuickImageProvider::Pixmap)
 {
-    QIcon::setThemeName("ubuntu-mobile");
+    QIcon::setThemeName("suru");
 }
 
 QPixmap UnityThemeIconProvider::requestPixmap(const QString &id, QSize *realSize, const QSize &requestedSize)