Unity 8

build.sh (+1/-0)
cmake/modules/QmlTest.cmake (+2/-1)
debian/control (+1/-0)
plugins/Dash/CardCreator.js (+5/-2)
plugins/Dash/listviewwithpageheader.cpp (+18/-7)
plugins/Dash/listviewwithpageheader.h (+6/-0)
qml/Components/ResponsiveGridView.qml (+5/-1)
qml/Dash/CardGrid.qml (+1/-0)
qml/Dash/CardTool.qml (+8/-5)
qml/Dash/CardVerticalJournal.qml (+1/-0)
qml/Dash/DashContent.qml (+3/-0)
qml/Dash/DashNavigation.qml (+1/-0)
qml/Dash/DashRenderer.qml (+4/-0)
qml/Dash/GenericScopeView.qml (+37/-14)
qml/Dash/ScopeListView.qml (+1/-0)
qml/Dash/ScopesOverviewAll.qml (+2/-0)
tests/autopilot/unity8/shell/emulators/dash.py (+2/-2)
tests/mocks/Ubuntu/CMakeLists.txt (+1/-0)
tests/mocks/Ubuntu/Connectivity/CMakeLists.txt (+10/-0)
tests/mocks/Ubuntu/Connectivity/networking-status.cpp (+64/-0)
tests/mocks/Ubuntu/Connectivity/networking-status.h (+73/-0)
tests/mocks/Ubuntu/Connectivity/plugin.cpp (+46/-0)
tests/mocks/Ubuntu/Connectivity/plugin.h (+35/-0)
tests/mocks/Ubuntu/Connectivity/qmldir (+2/-0)
tests/plugins/Dash/CMakeLists.txt (+3/-3)
tests/plugins/Dash/cardcreator/1.res (+2/-1)
tests/plugins/Dash/cardcreator/2.res (+2/-1)
tests/plugins/Dash/cardcreator/3.res (+3/-2)
tests/plugins/Dash/cardcreator/4.res (+3/-2)
tests/plugins/Dash/cardcreator/5.res (+3/-2)
tests/plugins/Dash/cardcreator/7.res (+3/-2)
tests/plugins/Dash/listviewwithpageheadertest.cpp (+39/-0)
tests/plugins/Dash/listviewwithpageheadertest.qml (+1/-0)
tests/plugins/Dash/listviewwithpageheadertestsection.qml (+1/-0)
tests/plugins/Dash/listviewwithpageheadertestsectionexternalmodel.qml (+1/-0)
tests/plugins/Ubuntu/Gestures/CMakeLists.txt (+1/-1)
tests/qmltests/Components/CMakeLists.txt (+1/-1)
tests/qmltests/Dash/tst_Card.qml (+26/-0)
tests/qmltests/Dash/tst_Dash.qml (+16/-39)
tests/qmltests/Dash/tst_DashContent.qml (+14/-1)
tests/qmltests/Dash/tst_GenericScopeView.qml (+7/-6)
tests/utils/modules/Unity/Test/UnityTestCase.qml (+3/-2)

To merge this branch:

bzr merge lp:~unity-team/unity8/scopes_more_things_on_memory

Related bugs:

Bug #1336724: Scrolling the dash is jumpy	High	Fix Released
Bug #1338430: Slow loading/showing of images in the dash	Critical	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Andrea Cimitan (community)		2014-09-23	Approve on 2014-09-30
PS Jenkins bot (community)	continuous-integration	2014-09-23	Needs Fixing on 2014-09-29
Albert Astals Cid (community)	has code of mine		Abstain on 2014-09-29
Review via email: mp+235588@code.launchpad.net

This proposal supersedes a proposal from 2014-09-23.

Commit message

Cache more things in memory, so flicking scopes should be faster

Description of the change

* Are there any related MPs required for this MP to build/function as expected?
No

* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

* Did you make sure that your branch does not contain spurious tags?
Yes

* 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?
N/A

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-26: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4092/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-26: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4110/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-27: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4125/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-27: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1211
http://jenkins.qa.ubuntu.com/job/unity8-ci/4128/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4105/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1129/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1222/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1222/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5357/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4128/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-27: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4137/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-28: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4156/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-28: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4162/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-29: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4171/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-29: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4178/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-29: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4180/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-01: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4187/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-01: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1221
http://jenkins.qa.ubuntu.com/job/unity8-ci/4188/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4283/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1189/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1282/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1282/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5535/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4188/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-01: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1222
http://jenkins.qa.ubuntu.com/job/unity8-ci/4191/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4286/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1192
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1285/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1285/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5538/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4191/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-01: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4194/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-04: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4225/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Omer Akram (om26er) wrote on 2014-09-09: Posted in a previous version of this proposal

Loving this branch.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-11: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4274/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) on 2014-09-15: Posted in a previous version of this proposal

review: Abstain (has code of mine)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-15: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4308/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-16: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4323/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) on 2014-09-18: Posted in a previous version of this proposal

review: Abstain (has code)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-18: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1227
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/~unity-team/unity8/scopes_more_things_on_memory/+merge/235161/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity8-ci/4348/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4962/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1349
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1442
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1442
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4718/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6214
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6214/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13407

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4348/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-19: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4352/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-19: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4355/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Andrea Cimitan (cimi) wrote on 2014-09-22: Posted in a previous version of this proposal

Few comments

review: Needs Fixing

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-09-22: Posted in a previous version of this proposal

Answered some of your comments.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-22: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4366/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-22: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4368/rebuild

review: Needs Fixing (continuous-integration)

lp:~unity-team/unity8/scopes_more_things_on_memory updated on 2014-09-23

1234. By Albert Astals Cid on 2014-09-23: things are a bit slower to load now since we're asking for a bazillion of items to be on memory so give the tryCompareFunction some more time

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-23:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4374/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-23:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4375/rebuild

review: Needs Fixing (continuous-integration)

lp:~unity-team/unity8/scopes_more_things_on_memory updated on 2014-09-23

1235. By Albert Astals Cid on 2014-09-23: Move common waiting to the top
1236. By Albert Astals Cid on 2014-09-23: Wait for stuff to settle

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-23:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4379/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-23:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4382/rebuild

review: Needs Fixing (continuous-integration)

lp:~unity-team/unity8/scopes_more_things_on_memory updated on 2014-09-25

1237. By Albert Astals Cid on 2014-09-25: Merge
1238. By Albert Astals Cid on 2014-09-25: We also need a longer wait in here

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-25:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4397/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-25:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4398/rebuild

review: Needs Fixing (continuous-integration)

lp:~unity-team/unity8/scopes_more_things_on_memory updated on 2014-09-25

1239. By Albert Astals Cid on 2014-09-25: Does this help?
1240. By Albert Astals Cid on 2014-09-25: Dude i had fixed this :S

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-26:

FAILED: Continuous integration, rev:1240
http://jenkins.qa.ubuntu.com/job/unity8-ci/4410/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5208/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1406/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1504/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1504/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6460/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4410/rebuild

review: Needs Fixing (continuous-integration)

lp:~unity-team/unity8/scopes_more_things_on_memory updated on 2014-09-26

1241. By Albert Astals Cid on 2014-09-25: next try
1242. By Albert Astals Cid on 2014-09-26: Merge

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-26:

FAILED: Continuous integration, rev:1242
http://jenkins.qa.ubuntu.com/job/unity8-ci/4414/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5239/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1410
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1508
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1508
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4966/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6491
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6491/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13822

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4414/rebuild

review: Needs Fixing (continuous-integration)

lp:~unity-team/unity8/scopes_more_things_on_memory updated on 2014-09-29

1243. By Albert Astals Cid on 2014-09-29: Mereg

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-29:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4420/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Andrea Cimitan (cimi) on 2014-09-29:

Revision history for this message

Albert Astals Cid (aacid) on 2014-09-29:

review: Abstain (has code of mine)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-09-29:

Fixed.

lp:~unity-team/unity8/scopes_more_things_on_memory updated on 2014-09-29

1244. By Albert Astals Cid on 2014-09-29: some minor fixes
1245. By Albert Astals Cid on 2014-09-29: Happier Cimi :)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-29:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4426/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Andrea Cimitan (cimi) wrote on 2014-09-30:

* Did you perform an exploratory manual test run of the code change and any related functionality?
Yes
* Did CI run pass? If not, please explain why.
unrelated
* Did you make sure that the branch does not contain spurious tags?
Yes

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Mohammad Rakibul Hasan

Unity Team

 === modified file 'build.sh'
 --- build.sh	2014-08-14 13:37:22 +0000
 +++ build.sh	2014-09-29 11:41:25 +0000
@@ -51,6 +51,7 @@
                           qtdeclarative5-ubuntu-settings-components \
                           qtdeclarative5-ubuntu-telephony0.1 \
                           qtdeclarative5-ubuntu-thumbnailer0.1 \
++                         qml-module-ubuntu-connectivity \
                           unity-notifications-impl \
                           ubuntu-mobile-icons \
                           unity-scope-home \
 === modified file 'cmake/modules/QmlTest.cmake'
 --- cmake/modules/QmlTest.cmake	2014-09-17 13:51:12 +0000
 +++ cmake/modules/QmlTest.cmake	2014-09-29 11:41:25 +0000
@@ -143,7 +143,7 @@
      add_manual_qml_test(${SUBPATH} ${COMPONENT_NAME} ${ARGN})
  endmacro(add_qml_test_internal)
--macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS)
++macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS ENVVAR)
      set(testCommand
            LD_LIBRARY_PATH=${LD_PATH}
            ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
@@ -160,6 +160,7 @@
      endif()
      set(xvfbtestCommand
            ${LD_PRELOAD_PATH}
++          ${ENVVAR}
            LD_LIBRARY_PATH=${LD_PATH}
            xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum
            ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
 === modified file 'debian/control'
 --- debian/control	2014-09-26 19:12:24 +0000
 +++ debian/control	2014-09-29 11:41:25 +0000
@@ -174,6 +174,7 @@
           libhardware2,
           unity-schemas (>= 7.3.1+14.10.20140915),
           pay-service,
++         qml-module-ubuntu-connectivity,
           ${misc:Depends},
           ${shlibs:Depends},
  Provides: unity-launcher-impl,
 === modified file 'plugins/Dash/CardCreator.js'
 --- plugins/Dash/CardCreator.js	2014-09-17 11:17:26 +0000
 +++ plugins/Dash/CardCreator.js	2014-09-29 11:41:25 +0000
@@ -84,7 +84,8 @@
                                      } \n\
                                      image: Image { \n\
                                          objectName: "artImage"; \n\
--                                        source: cardData && cardData["art"] || ""; \n\
++                                        property bool doLoadSource: !NetworkingStatus.limitedBandwith; \n\
++                                        source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["art"] || ""; } \n\
                                          cache: true; \n\
                                          asynchronous: root.asynchronous; \n\
                                          fillMode: Image.PreserveAspectCrop; \n\
@@ -195,7 +196,8 @@
                              objectName: "mascotImage"; \n\
                              anchors { %1 } \n\
                              readonly property int maxSize: Math.max(width, height) * 4; \n\
--                            source: cardData && cardData["mascot"] || ""; \n\
++                            property bool doLoadSource: !NetworkingStatus.limitedBandwith; \n\
++                            source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["mascot"] || ""; } \n\
                              width: units.gu(6); \n\
                              height: units.gu(5.625); \n\
                              sourceSize { width: maxSize; height: maxSize } \n\
@@ -655,6 +657,7 @@
  function createCardComponent(parent, template, components) {
      var imports = 'import QtQuick 2.2; \n\
                     import Ubuntu.Components 1.1; \n\
++                   import Ubuntu.Connectivity 1.0; \n\
                     import Dash 0.1;\n\
                     import Utils 0.1;\n';
      var card = cardString(template, components);
 === modified file 'plugins/Dash/listviewwithpageheader.cpp'
 --- plugins/Dash/listviewwithpageheader.cpp	2014-09-15 15:28:06 +0000
 +++ plugins/Dash/listviewwithpageheader.cpp	2014-09-29 11:41:25 +0000
@@ -104,8 +104,6 @@
  #pragma GCC diagnostic pop
  // #include <private/qquickrectangle_p.h>
--static const qreal bufferRatio = 0.5;
--
  qreal ListViewWithPageHeader::ListItem::height() const
+ {
      return m_item->height() + (m_sectionItem ? m_sectionItem->height() : 0);
@@ -158,6 +156,7 @@
   , m_forceNoClip(false)
   , m_inLayout(false)
   , m_inContentHeightKeepHeaderShown(false)
++ , m_cacheBuffer(0)
+ {
      m_clipItem = new QQuickItem(contentItem());
  //     m_clipItem = new QQuickRectangle(contentItem());
@@ -335,6 +334,20 @@
      return m_headerItemShownHeight;
+ }
++qreal ListViewWithPageHeader::cacheBuffer() const
++{
++    return m_cacheBuffer;
++}
++
++void ListViewWithPageHeader::setCacheBuffer(qreal cacheBuffer)
++{
++    if (cacheBuffer != m_cacheBuffer) {
++        m_cacheBuffer = cacheBuffer;
++        Q_EMIT cacheBufferChanged();
++        polish();
++    }
++}
++
  void ListViewWithPageHeader::positionAtBeginning()
+ {
      if (m_delegateModel->count() <= 0)
@@ -356,8 +369,7 @@
          // Create the subsequent items
          int modelIndex = 1;
          qreal pos = item->y() + item->height();
--        const qreal buffer = height() * bufferRatio;
--        const qreal bufferTo = height() + buffer;
++        const qreal bufferTo = height() + m_cacheBuffer;
          while (modelIndex < m_delegateModel->count() && pos <= bufferTo) {
              if (!(item = createItem(modelIndex, false)))
                  break;
@@ -603,11 +615,10 @@
          return;
+     }
--    const qreal buffer = height() * bufferRatio;
      const qreal from = contentY();
      const qreal to = from + height();
--    const qreal bufferFrom = from - buffer;
--    const qreal bufferTo = to + buffer;
++    const qreal bufferFrom = from - m_cacheBuffer;
++    const qreal bufferTo = to + m_cacheBuffer;
      bool added = addVisibleItems(from, to, false);
      bool removed = removeNonVisibleItems(bufferFrom, bufferTo);
 === modified file 'plugins/Dash/listviewwithpageheader.h'
 --- plugins/Dash/listviewwithpageheader.h	2014-09-11 15:51:55 +0000
 +++ plugins/Dash/listviewwithpageheader.h	2014-09-29 11:41:25 +0000
@@ -54,6 +54,7 @@
      Q_PROPERTY(bool forceNoClip READ forceNoClip WRITE setForceNoClip NOTIFY forceNoClipChanged)
      Q_PROPERTY(int stickyHeaderHeight READ stickyHeaderHeight NOTIFY stickyHeaderHeightChanged)
      Q_PROPERTY(qreal headerItemShownHeight READ headerItemShownHeight NOTIFY headerItemShownHeightChanged)
++    Q_PROPERTY(qreal cacheBuffer READ cacheBuffer WRITE setCacheBuffer NOTIFY cacheBufferChanged)
      friend class ListViewWithPageHeaderTest;
      friend class ListViewWithPageHeaderTestSection;
@@ -84,6 +85,9 @@
      int stickyHeaderHeight() const;
      qreal headerItemShownHeight() const;
++    qreal cacheBuffer() const;
++    void setCacheBuffer(qreal cacheBuffer);
++
      Q_INVOKABLE void positionAtBeginning();
      Q_INVOKABLE void showHeader();
      Q_INVOKABLE int firstCreatedIndex() const;
@@ -105,6 +109,7 @@
      void forceNoClipChanged();
      void stickyHeaderHeightChanged();
      void headerItemShownHeightChanged();
++    void cacheBufferChanged();
  protected:
      void componentComplete() override;
@@ -199,6 +204,7 @@
      bool m_forceNoClip;
      bool m_inLayout;
      bool m_inContentHeightKeepHeaderShown;
++    qreal m_cacheBuffer;
      // Qt 5.0 doesn't like releasing the items just after itemCreated
      // so we delay the releasing until the next updatePolish
 === modified file 'qml/Components/ResponsiveGridView.qml'
 --- qml/Components/ResponsiveGridView.qml	2014-07-21 14:13:26 +0000
 +++ qml/Components/ResponsiveGridView.qml	2014-09-29 11:41:25 +0000
@@ -34,7 +34,11 @@
      readonly property int cellWidth: gridView.cellWidth
      readonly property int cellHeight: gridView.cellHeight
      readonly property int totalContentHeight: {
--        return contentHeightForRows(Math.ceil(gridView.model.count / columns), cellHeight)
++        if (gridView.model) {
++            return contentHeightForRows(Math.ceil(gridView.model.count / columns), cellHeight)
++        } else {
++            return 0;
++        }
+     }
      property alias interactive: gridView.interactive
      readonly property alias flicking: gridView.flicking
 === modified file 'qml/Dash/CardGrid.qml'
 --- qml/Dash/CardGrid.qml	2014-09-09 19:08:33 +0000
 +++ qml/Dash/CardGrid.qml	2014-09-29 11:41:25 +0000
@@ -55,6 +55,7 @@
          delegate: Item {
              width: grid.cellWidth
              height: grid.cellHeight
++            visible: y + height >= root.visibleRangeBegin && y <= root.visibleRangeEnd
              Loader {
                  id: loader
                  sourceComponent: cardTool.cardComponent
 === modified file 'qml/Dash/CardTool.qml'
 --- qml/Dash/CardTool.qml	2014-09-08 14:11:57 +0000
 +++ qml/Dash/CardTool.qml	2014-09-29 11:41:25 +0000
@@ -169,16 +169,19 @@
      Item {
          id: attributesModel
--        property int numOfAttributes: {
++        property int numOfAttributes: 0
++        property var model: []
++        property bool hasAttributes: {
              var attributes = components["attributes"];
--            if ((attributes != undefined) && attributes["field"]) {
++            var hasAttributesFlag = (attributes != undefined) && attributes["field"];
++
++            if (hasAttributesFlag) {
                  if (attributes["max-count"]) {
--                    return attributes["max-count"];
++                    numOfAttributes = attributes["max-count"];
+                 }
+             }
--            return 0;
++            return hasAttributesFlag
+         }
--        property var model: []
          onNumOfAttributesChanged: {
              model = []
 === modified file 'qml/Dash/CardVerticalJournal.qml'
 --- qml/Dash/CardVerticalJournal.qml	2014-09-12 09:31:56 +0000
 +++ qml/Dash/CardVerticalJournal.qml	2014-09-29 11:41:25 +0000
@@ -49,6 +49,7 @@
              id: loader
              sourceComponent: cardTool.cardComponent
              width: cardTool.cardWidth
++            visible: y + height >= root.visibleRangeBegin && y <= root.visibleRangeEnd
              onLoaded: {
                  item.objectName = "delegate" + index;
                  item.fixedArtShapeSize = Qt.binding(function() { return cardTool.artShapeSize; });
 === modified file 'qml/Dash/DashContent.qml'
 --- qml/Dash/DashContent.qml	2014-08-27 15:35:52 +0000
 +++ qml/Dash/DashContent.qml	2014-09-29 11:41:25 +0000
@@ -111,6 +111,8 @@
              highlightMoveDuration: 250
              highlightRangeMode: ListView.StrictlyEnforceRange
              // TODO Investigate if we can switch to a smaller cache buffer when/if UbuntuShape gets more performant
++            // 1073741823 is s^30 -1. A quite big number so that you have "infinite" cache, but not so
++            // big so that if you add if with itself you're outside the 2^31 int range
              cacheBuffer: 1073741823
              onMovementStarted: currentItem.item.showHeader();
              clip: parent.x != 0
@@ -177,6 +179,7 @@
                          dashContent.scopeLoaded(item.scope.id)
                          item.paginationCount = Qt.binding(function() { return dashContentList.count } )
                          item.paginationIndex = Qt.binding(function() { return dashContentList.currentIndex } )
++                        item.holdingList = dashContentList;
+                     }
                      Connections {
                          target: isCurrent ? scope : null
 === modified file 'qml/Dash/DashNavigation.qml'
 --- qml/Dash/DashNavigation.qml	2014-08-28 07:42:46 +0000
 +++ qml/Dash/DashNavigation.qml	2014-09-29 11:41:25 +0000
@@ -52,6 +52,7 @@
      Rectangle {
          id: blackRect
++        objectName: "blackRect"
          color: "black"
          opacity: openList && openList.currentItem && openList.currentItem.visible ? 0.5 : 0
          Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration } }
 === modified file 'qml/Dash/DashRenderer.qml'
 --- qml/Dash/DashRenderer.qml	2014-09-10 07:01:34 +0000
 +++ qml/Dash/DashRenderer.qml	2014-09-29 11:41:25 +0000
@@ -27,6 +27,10 @@
      property int displayMarginEnd: 0
++    property int visibleRangeBegin: 0
++
++    property int visibleRangeEnd: 0
++
      property real originY: 0
      // The model to renderer
 === modified file 'qml/Dash/GenericScopeView.qml'
 --- qml/Dash/GenericScopeView.qml	2014-09-18 21:23:55 +0000
 +++ qml/Dash/GenericScopeView.qml	2014-09-29 11:41:25 +0000
@@ -38,6 +38,7 @@
      property int paginationCount: 0
      property int paginationIndex: 0
      property alias pageHeaderTotallyVisible: categoryView.pageHeaderTotallyVisible
++    property var holdingList: null
      property var scopeStyle: ScopeStyle {
          style: scope ? scope.customizations : {}
@@ -251,8 +252,8 @@
+                 }
+             }
--            onHeightChanged: rendererLoader.updateDelegateCreationRange();
--            onYChanged: rendererLoader.updateDelegateCreationRange();
++            onHeightChanged: rendererLoader.updateRanges();
++            onYChanged: rendererLoader.updateRanges();
              Loader {
                  id: rendererLoader
@@ -314,7 +315,7 @@
                          var shouldExpand = baseItem.category === categoryView.expandedCategoryId;
                          baseItem.expand(shouldExpand, false /*animate*/);
+                     }
--                    updateDelegateCreationRange();
++                    updateRanges();
                      if (scope && scope.id === "clickscope" && (categoryId === "predefined" || categoryId === "local")) {
                          // Yeah, hackish :/
                          cardTool.artShapeSize = Qt.size(units.gu(8), units.gu(7.5));
@@ -348,13 +349,25 @@
+                 }
                  Connections {
                      target: categoryView
--                    onOriginYChanged: rendererLoader.updateDelegateCreationRange();
--                    onContentYChanged: rendererLoader.updateDelegateCreationRange();
--                    onHeightChanged: rendererLoader.updateDelegateCreationRange();
--                    onContentHeightChanged: rendererLoader.updateDelegateCreationRange();
--                }
--
--                function updateDelegateCreationRange() {
++                    onOriginYChanged: rendererLoader.updateRanges();
++                    onContentYChanged: rendererLoader.updateRanges();
++                    onHeightChanged: rendererLoader.updateRanges();
++                    onContentHeightChanged: rendererLoader.updateRanges();
++                }
++                Connections {
++                    target: scopeView
++                    onIsCurrentChanged: rendererLoader.updateRanges();
++                }
++                Connections {
++                    target: holdingList
++                    onMovingChanged: if (!moving) rendererLoader.updateRanges();
++                }
++
++                function updateRanges() {
++                    if (holdingList && holdingList.moving) {
++                        return;
++                    }
++
                      if (categoryView.moving) {
                          // Do not update the range if we are overshooting up or down, since we'll come back
                          // to the stable position and delete/create items without any reason
@@ -366,10 +379,20 @@
+                         }
+                     }
++                    if (item && item.hasOwnProperty("visibleRangeBegin")) {
++                        item.visibleRangeBegin = Math.max(-baseItem.y, 0)
++                        item.visibleRangeEnd = item.visibleRangeBegin + Math.min(categoryView.height, rendererLoader.height)
++                    }
++
                      if (item && item.hasOwnProperty("displayMarginBeginning")) {
                          // TODO do we need item.originY here, test 1300302 once we have a silo
                          // and we can run it on the phone
--                        if (baseItem.y + baseItem.height <= 0) {
++                        if (scopeView.isCurrent) {
++                            // 1073741823 is s^30 -1. A quite big number so that you have "infinite" display margin, but not so
++                            // big so that if you add if with itself you're outside the 2^31 int range
++                            item.displayMarginBeginning = 1073741823;
++                            item.displayMarginEnd = 1073741823;
++                        } else if (baseItem.y + baseItem.height <= 0) {
                              // Not visible (item at top of the list viewport)
                              item.displayMarginBeginning = -baseItem.height;
                              item.displayMarginEnd = 0;
@@ -378,9 +401,9 @@
                              item.displayMarginBeginning = 0;
                              item.displayMarginEnd = -baseItem.height;
                          } else {
--                            item.displayMarginBeginning = -Math.max(-baseItem.y, 0);
--                            item.displayMarginEnd = -Math.max(baseItem.height - seeAll.height
--                                                              - categoryView.height + baseItem.y, 0)
++                            item.displayMarginBeginning = Math.round(-Math.max(-baseItem.y, 0));
++                            item.displayMarginEnd = -Math.round(Math.max(baseItem.height - seeAll.height -
++                                                                         categoryView.height + baseItem.y, 0));
+                         }
+                     }
+                 }
 === modified file 'qml/Dash/ScopeListView.qml'
 --- qml/Dash/ScopeListView.qml	2014-07-23 06:54:10 +0000
 +++ qml/Dash/ScopeListView.qml	2014-09-29 11:41:25 +0000
@@ -20,4 +20,5 @@
  ListViewWithPageHeader {
      maximumFlickVelocity: height * 10
      flickDeceleration: height * 2
++    cacheBuffer: Number.MAX_VALUE
+ }
 === modified file 'qml/Dash/ScopesOverviewAll.qml'
 --- qml/Dash/ScopesOverviewAll.qml	2014-09-18 05:15:18 +0000
 +++ qml/Dash/ScopesOverviewAll.qml	2014-09-29 11:41:25 +0000
@@ -43,6 +43,8 @@
          id: cardGrid
          width: root.width
          height: parent.height
++        visibleRangeBegin: root.contentY
++        visibleRangeEnd: root.contentY + root.height
          onClicked: {
              root.clicked(index, result, item, itemModel);
 === modified file 'tests/autopilot/unity8/shell/emulators/dash.py'
 --- tests/autopilot/unity8/shell/emulators/dash.py	2014-08-25 16:07:45 +0000
 +++ tests/autopilot/unity8/shell/emulators/dash.py	2014-09-29 11:41:25 +0000
@@ -93,7 +93,7 @@
                  'No scope found with id {0}'.format(scope_id))
      def _get_scope_from_loader(self, loader):
--        return loader.get_children()[0]
++        return loader.wait_select_single('GenericScopeView');
      def _open_scope_scrolling(self, scope_loader):
          scroll = self._get_scroll_direction(scope_loader)
@@ -102,8 +102,8 @@
              scroll()
              self.dash_content_list.moving.wait_for(False)
++        scope_loader.isCurrent.wait_for(True)
          scope = self._get_scope_from_loader(scope_loader)
--        scope.isCurrent.wait_for(True)
          return scope
      def _get_scroll_direction(self, scope_loader):
 === modified file 'tests/mocks/Ubuntu/CMakeLists.txt'
 --- tests/mocks/Ubuntu/CMakeLists.txt	2014-08-25 10:05:13 +0000
 +++ tests/mocks/Ubuntu/CMakeLists.txt	2014-09-29 11:41:25 +0000
@@ -1,3 +1,4 @@
++add_subdirectory(Connectivity)
  add_subdirectory(DownloadDaemonListener)
  add_subdirectory(Payments)
  add_subdirectory(SystemImage)
 === added directory 'tests/mocks/Ubuntu/Connectivity'
 === added file 'tests/mocks/Ubuntu/Connectivity/CMakeLists.txt'
 --- tests/mocks/Ubuntu/Connectivity/CMakeLists.txt	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Ubuntu/Connectivity/CMakeLists.txt	2014-09-29 11:41:25 +0000
@@ -0,0 +1,10 @@
++add_library(connectivity-qml SHARED
++    networking-status.cpp
++    plugin.cpp
++)
++qt5_use_modules(connectivity-qml Qml)
++
++# copy qmldir file into build directory for shadow builds
++file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
++    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
++    )
 === added file 'tests/mocks/Ubuntu/Connectivity/networking-status.cpp'
 --- tests/mocks/Ubuntu/Connectivity/networking-status.cpp	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Ubuntu/Connectivity/networking-status.cpp	2014-09-29 11:41:25 +0000
@@ -0,0 +1,64 @@
++/*
++ * Copyright © 2014 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU Lesser General Public License version 3,
++ * as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authors:
++ *     Antti Kaijanmäki <antti.kaijanmaki@canonical.com>
++ */
++
++#include "networking-status.h"
++
++NetworkingStatus::NetworkingStatus(QObject *parent)
++        : QObject(parent)
++{
++    qRegisterMetaType<NetworkingStatus::Limitations>();
++    qRegisterMetaType<QVector<NetworkingStatus::Limitations>>();
++    qRegisterMetaType<NetworkingStatus::Status>();
++}
++
++NetworkingStatus::~NetworkingStatus()
++{}
++
++QVector<NetworkingStatus::Limitations>
++NetworkingStatus::limitations() const
++{
++    return m_limitations;
++}
++
++NetworkingStatus::Status
++NetworkingStatus::status() const
++{
++    return Status::Online;
++}
++
++bool
++NetworkingStatus::online() const
++{
++    return status() == Status::Online;
++}
++
++bool
++NetworkingStatus::limitedBandwith() const
++{
++    return limitations().contains(Limitations::Bandwith);
++}
++
++void NetworkingStatus::setLimitedBandwidth(bool limited)
++{
++    if (limited) {
++        m_limitations << Limitations::Bandwith;
++    } else if (limitedBandwith()) {
++        m_limitations.remove(m_limitations.indexOf(Limitations::Bandwith));
++    }
++}
 === added file 'tests/mocks/Ubuntu/Connectivity/networking-status.h'
 --- tests/mocks/Ubuntu/Connectivity/networking-status.h	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Ubuntu/Connectivity/networking-status.h	2014-09-29 11:41:25 +0000
@@ -0,0 +1,73 @@
++/*
++ * Copyright © 2014 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU Lesser General Public License version 3,
++ * as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ */
++
++#ifndef FAKE_NETWORKING_STATUS_H
++#define FAKE_NETWORKING_STATUS_H
++
++#include <QObject>
++#include <QVector>
++
++class Q_DECL_EXPORT NetworkingStatus : public QObject
++{
++    Q_OBJECT
++    Q_DISABLE_COPY(NetworkingStatus)
++
++    Q_ENUMS(Limitations)
++    Q_ENUMS(Status)
++
++    Q_PROPERTY(QVector<Limitations> limitations READ limitations NOTIFY limitationsChanged)
++    Q_PROPERTY(Status status READ status NOTIFY statusChanged)
++    Q_PROPERTY(bool online READ online NOTIFY onlineChanged)
++    Q_PROPERTY(bool limitedBandwith READ limitedBandwith WRITE setLimitedBandwidth NOTIFY limitedBandwithChanged)
++
++public:
++    explicit NetworkingStatus(QObject *parent = 0);
++    virtual ~NetworkingStatus();
++
++    enum Limitations {
++        Bandwith
++    };
++
++    enum Status {
++        Offline,
++        Connecting,
++        Online
++    };
++
++    QVector<Limitations> limitations() const;
++    Status status() const;
++    bool online() const;
++    bool limitedBandwith() const;
++
++    // Only in the fake one
++    void setLimitedBandwidth(bool limited);
++
++Q_SIGNALS:
++    void limitationsChanged();
++    void statusChanged(Status value);
++    void onlineChanged(bool value);
++    void limitedBandwithChanged(bool value);
++
++private:
++    QVector<NetworkingStatus::Limitations> m_limitations;
++};
++
++Q_DECLARE_METATYPE(NetworkingStatus::Limitations)
++Q_DECLARE_METATYPE(QVector<NetworkingStatus::Limitations>)
++Q_DECLARE_METATYPE(NetworkingStatus::Status)
++
++#endif // FAKE_NETWORKING_STATUS_H
 === added file 'tests/mocks/Ubuntu/Connectivity/plugin.cpp'
 --- tests/mocks/Ubuntu/Connectivity/plugin.cpp	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Ubuntu/Connectivity/plugin.cpp	2014-09-29 11:41:25 +0000
@@ -0,0 +1,46 @@
++/*
++ * Copyright © 2014 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU Lesser General Public License version 3,
++ * as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authors:
++ *     Antti Kaijanmäki <antti.kaijanmaki@canonical.com>
++ */
++
++#include "plugin.h"
++
++#include <QtQml>
++
++#include "networking-status.h"
++
++static QObject *
++networkingStatusSingletonProvider(QQmlEngine *engine, QJSEngine *scriptEngine)
++{
++    Q_UNUSED(scriptEngine)
++
++    return new NetworkingStatus(engine);
++}
++
++void
++QmlConnectivityNetworkingPlugin::registerTypes(const char *uri)
++{
++    // @uri Ubuntu.Connectivity
++    qmlRegisterSingletonType<NetworkingStatus>(uri, 1, 0, "NetworkingStatus", networkingStatusSingletonProvider);
++}
++
++void
++QmlConnectivityNetworkingPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
++{
++  Q_UNUSED(uri);
++  Q_UNUSED(engine);
++}
 === added file 'tests/mocks/Ubuntu/Connectivity/plugin.h'
 --- tests/mocks/Ubuntu/Connectivity/plugin.h	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Ubuntu/Connectivity/plugin.h	2014-09-29 11:41:25 +0000
@@ -0,0 +1,35 @@
++/*
++ * Copyright © 2014 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU Lesser General Public License version 3,
++ * as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authors:
++ *     Antti Kaijanmäki <antti.kaijanmaki@canonical.com>
++ */
++
++#ifndef QML_CONNECTIVITY_PLUGIN_H
++#define QML_CONNECTIVITY_PLUGIN_H
++
++#include <QQmlExtensionPlugin>
++
++class QmlConnectivityNetworkingPlugin : public QQmlExtensionPlugin {
++    Q_OBJECT
++    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
++    Q_INTERFACES(QQmlExtensionInterface)
++
++public:
++    void registerTypes(const char *uri);
++    void initializeEngine(QQmlEngine *engine, const char *uri);
++};
++
++#endif // QML_CONNECTIVITY_PLUGIN_H
 === added file 'tests/mocks/Ubuntu/Connectivity/qmldir'
 --- tests/mocks/Ubuntu/Connectivity/qmldir	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Ubuntu/Connectivity/qmldir	2014-09-29 11:41:25 +0000
@@ -0,0 +1,2 @@
++module Ubuntu.Connectivity
++plugin connectivity-qml
 === modified file 'tests/plugins/Dash/CMakeLists.txt'
 --- tests/plugins/Dash/CMakeLists.txt	2014-07-22 10:03:37 +0000
 +++ tests/plugins/Dash/CMakeLists.txt	2014-09-29 11:41:25 +0000
@@ -32,7 +32,7 @@
      qt5_use_modules(${TESTNAME}TestExec Test Core Qml)
      target_link_libraries(${TESTNAME}TestExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})
--    add_binary_qml_test(${TESTNAME} "" "Dash-qml")
++    add_binary_qml_test(${TESTNAME} "" "Dash-qml" "")
  endmacro()
  add_lvwph_test(listviewwithpageheader ListViewWithPageHeader)
@@ -48,7 +48,7 @@
      qt5_use_modules(${TESTNAME}TestExec Test Core Qml)
      target_link_libraries(${TESTNAME}TestExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})
--    add_binary_qml_test(${TESTNAME} "" "Dash-qml")
++    add_binary_qml_test(${TESTNAME} "" "Dash-qml" "")
      add_executable(${TESTNAME}tryExec
          ${FILENAME}try.cpp
@@ -71,7 +71,7 @@
  add_executable(CardCreatorTestExec cardcreatortest.cpp)
  qt5_use_modules(CardCreatorTestExec Test Core Qml)
  target_link_libraries(CardCreatorTestExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})
--add_binary_qml_test(CardCreator "" "Dash-qml")
++add_binary_qml_test(CardCreator "" "Dash-qml" "QML2_IMPORT_PATH=${CMAKE_BINARY_DIR}/tests/mocks/")
  # plain qml test
  set(qmltest_DEFAULT_TARGETS qmluitests)
 === modified file 'tests/plugins/Dash/cardcreator/1.res'
 --- tests/plugins/Dash/cardcreator/1.res	2014-09-17 14:17:21 +0000
 +++ tests/plugins/Dash/cardcreator/1.res	2014-09-29 11:41:25 +0000
@@ -46,7 +46,8 @@
+                                     }
                                      image: Image {
                                          objectName: "artImage";
--                                        source: cardData && cardData["art"] || "";
++                                        property bool doLoadSource: !NetworkingStatus.limitedBandwith;
++                                        source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["art"] || ""; }
                                          cache: true;
                                          asynchronous: root.asynchronous;
                                          fillMode: Image.PreserveAspectCrop;
 === modified file 'tests/plugins/Dash/cardcreator/2.res'
 --- tests/plugins/Dash/cardcreator/2.res	2014-08-29 08:31:22 +0000
 +++ tests/plugins/Dash/cardcreator/2.res	2014-09-29 11:41:25 +0000
@@ -67,7 +67,8 @@
                              objectName: "mascotImage";
                              anchors { verticalCenter: parent.verticalCenter; }
                              readonly property int maxSize: Math.max(width, height) * 4;
--                            source: cardData && cardData["mascot"] || "";
++                            property bool doLoadSource: !NetworkingStatus.limitedBandwith;
++                            source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["mascot"] || ""; }
                              width: units.gu(6);
                              height: units.gu(5.625);
                              sourceSize { width: maxSize; height: maxSize }
 === modified file 'tests/plugins/Dash/cardcreator/3.res'
 --- tests/plugins/Dash/cardcreator/3.res	2014-09-17 14:17:21 +0000
 +++ tests/plugins/Dash/cardcreator/3.res	2014-09-29 11:41:25 +0000
@@ -46,8 +46,9 @@
+                                     }
                                      image: Image {
                                          objectName: "artImage";
--                                        source: cardData && cardData["art"] || "";
--                                        cache: true;
++                                        property bool doLoadSource: !NetworkingStatus.limitedBandwith;
++                                        source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["art"] || ""; }
++                                        cache: true;
                                          asynchronous: root.asynchronous;
                                          fillMode: Image.PreserveAspectCrop;
                                          width: root.width;
 === modified file 'tests/plugins/Dash/cardcreator/4.res'
 --- tests/plugins/Dash/cardcreator/4.res	2014-08-13 10:29:21 +0000
 +++ tests/plugins/Dash/cardcreator/4.res	2014-09-29 11:41:25 +0000
@@ -46,8 +46,9 @@
                      objectName: "mascotImage";
                      anchors { verticalCenter: parent.verticalCenter; }
                      readonly property int maxSize: Math.max(width, height) * 4;
--                    source: cardData && cardData["mascot"] || "";
--                    width: units.gu(6);
++                    property bool doLoadSource: !NetworkingStatus.limitedBandwith;
++                    source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["mascot"] || ""; }
++                    width: units.gu(6);
                      height: units.gu(5.625);
                      sourceSize { width: maxSize; height: maxSize }
                      fillMode: Image.PreserveAspectCrop;
 === modified file 'tests/plugins/Dash/cardcreator/5.res'
 --- tests/plugins/Dash/cardcreator/5.res	2014-09-17 14:17:21 +0000
 +++ tests/plugins/Dash/cardcreator/5.res	2014-09-29 11:41:25 +0000
@@ -46,8 +46,9 @@
+                                     }
                                      image: Image {
                                          objectName: "artImage";
--                                        source: cardData && cardData["art"] || "";
--                                        cache: true;
++                                        property bool doLoadSource: !NetworkingStatus.limitedBandwith;
++                                        source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["art"] || ""; }
++                                        cache: true;
                                          asynchronous: root.asynchronous;
                                          fillMode: Image.PreserveAspectCrop;
                                          width: root.width;
 === modified file 'tests/plugins/Dash/cardcreator/7.res'
 --- tests/plugins/Dash/cardcreator/7.res	2014-08-29 08:31:22 +0000
 +++ tests/plugins/Dash/cardcreator/7.res	2014-09-29 11:41:25 +0000
@@ -67,8 +67,9 @@
                              objectName: "mascotImage";
                              anchors { verticalCenter: parent.verticalCenter; }
                              readonly property int maxSize: Math.max(width, height) * 4;
--                            source: cardData && cardData["mascot"] || "";
--                            width: units.gu(6);
++                            property bool doLoadSource: !NetworkingStatus.limitedBandwith;
++                            source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["mascot"] || ""; }
++                            width: units.gu(6);
                              height: units.gu(5.625);
                              sourceSize { width: maxSize; height: maxSize }
                              fillMode: Image.PreserveAspectCrop;
 === modified file 'tests/plugins/Dash/listviewwithpageheadertest.cpp'
 --- tests/plugins/Dash/listviewwithpageheadertest.cpp	2014-04-24 14:13:21 +0000
 +++ tests/plugins/Dash/listviewwithpageheadertest.cpp	2014-09-29 11:41:25 +0000
@@ -28,6 +28,8 @@
  #include <private/qquickitem_p.h>
  #pragma GCC diagnostic pop
++#include <limits>
++
  // TODO Think on how doing a test for lost items
  // particullary making sure that lost items are culled
  // and then removed in the next updatePolish cycle
@@ -1899,6 +1901,43 @@
          QTRY_COMPARE(lvwph->m_firstVisibleIndex, 0);
+     }
++    void testNoCacheBuffer()
++    {
++        lvwph->setCacheBuffer(0);
++        QTRY_COMPARE(lvwph->m_visibleItems.count(), 3);
++        QCOMPARE(lvwph->m_firstVisibleIndex, 0);
++        verifyItem(0, 50., 150., false);
++        verifyItem(1, 200., 200., false);
++        verifyItem(2, 400., 350., false);
++        QCOMPARE(lvwph->m_minYExtent, 0.);
++        QCOMPARE(lvwph->m_clipItem->y(), 0.);
++        QCOMPARE(lvwph->m_clipItem->clip(), false);
++        QCOMPARE(lvwph->m_headerItem->y(), 0.);
++        QCOMPARE(lvwph->m_headerItem->height(), 50.);
++        QCOMPARE(lvwph->contentY(), 0.);
++        QCOMPARE(lvwph->m_headerItemShownHeight, 0.);
++    }
++
++    void testAllCacheBuffer()
++    {
++        lvwph->setCacheBuffer(std::numeric_limits<qreal>::max());
++        QTRY_COMPARE(lvwph->m_visibleItems.count(), 6);
++        QCOMPARE(lvwph->m_firstVisibleIndex, 0);
++        verifyItem(0, 50., 150., false);
++        verifyItem(1, 200., 200., false);
++        verifyItem(2, 400., 350., false);
++        verifyItem(3, 750., 350., true);
++        verifyItem(4, 1100., 350., true);
++        verifyItem(5, 1450., 350., true);
++        QCOMPARE(lvwph->m_minYExtent, 0.);
++        QCOMPARE(lvwph->m_clipItem->y(), 0.);
++        QCOMPARE(lvwph->m_clipItem->clip(), false);
++        QCOMPARE(lvwph->m_headerItem->y(), 0.);
++        QCOMPARE(lvwph->m_headerItem->height(), 50.);
++        QCOMPARE(lvwph->contentY(), 0.);
++        QCOMPARE(lvwph->m_headerItemShownHeight, 0.);
++    }
++
  private:
      QQuickView *view;
      ListViewWithPageHeader *lvwph;
 === modified file 'tests/plugins/Dash/listviewwithpageheadertest.qml'
 --- tests/plugins/Dash/listviewwithpageheadertest.qml	2014-04-30 10:06:33 +0000
 +++ tests/plugins/Dash/listviewwithpageheadertest.qml	2014-09-29 11:41:25 +0000
@@ -60,6 +60,7 @@
          anchors.top: parent.top
          anchors.bottom: parent.bottom
          model: model
++        cacheBuffer: height * 0.5
          delegate: Rectangle {
              property bool timerDone: false
              width: parent.width - 20
 === modified file 'tests/plugins/Dash/listviewwithpageheadertestsection.qml'
 --- tests/plugins/Dash/listviewwithpageheadertestsection.qml	2014-04-30 10:06:33 +0000
 +++ tests/plugins/Dash/listviewwithpageheadertestsection.qml	2014-09-29 11:41:25 +0000
@@ -60,6 +60,7 @@
          anchors.top: parent.top
          anchors.bottom: parent.bottom
          model: model
++        cacheBuffer: height * 0.5
          delegate: Rectangle {
              property bool timerDone: false
              width: parent.width - 20
 === modified file 'tests/plugins/Dash/listviewwithpageheadertestsectionexternalmodel.qml'
 --- tests/plugins/Dash/listviewwithpageheadertestsectionexternalmodel.qml	2014-04-30 10:06:33 +0000
 +++ tests/plugins/Dash/listviewwithpageheadertestsectionexternalmodel.qml	2014-09-29 11:41:25 +0000
@@ -28,6 +28,7 @@
          anchors.top: parent.top
          anchors.bottom: parent.bottom
          model: model
++        cacheBuffer: height * 0.5
          delegate: Rectangle {
              property bool timerDone: false
              width: parent.width - 20
 === modified file 'tests/plugins/Ubuntu/Gestures/CMakeLists.txt'
 --- tests/plugins/Ubuntu/Gestures/CMakeLists.txt	2014-05-01 14:25:18 +0000
 +++ tests/plugins/Ubuntu/Gestures/CMakeLists.txt	2014-09-29 11:41:25 +0000
@@ -19,7 +19,7 @@
      qt5_use_modules(${CLASSNAME}TestExec Test Core Qml Gui Quick)
      target_link_libraries(${CLASSNAME}TestExec UbuntuGestureQml)
--    add_binary_qml_test(${CLASSNAME} ${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures UbuntuGesturesTestQmlFiles)
++    add_binary_qml_test(${CLASSNAME} ${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures UbuntuGesturesTestQmlFiles "")
      add_manual_qml_test(. ${CLASSNAME} IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)
  endmacro(add_gesture_ui_test)
 === modified file 'tests/qmltests/Components/CMakeLists.txt'
 --- tests/qmltests/Components/CMakeLists.txt	2014-05-01 14:25:18 +0000
 +++ tests/qmltests/Components/CMakeLists.txt	2014-09-29 11:41:25 +0000
@@ -10,7 +10,7 @@
  qt5_use_modules(DragHandleTestExec Test Core Qml Gui Quick)
  target_link_libraries(DragHandleTestExec UbuntuGestureQml)
--add_binary_qml_test(DragHandle ${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures "")
++add_binary_qml_test(DragHandle ${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures "" "")
  add_manual_qml_test(. DragHandle IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)
  add_definitions(-DUBUNTU_GESTURES_PLUGIN_DIR="${CMAKE_BINARY_DIR}/plugins")
 === modified file 'tests/qmltests/Dash/tst_Card.qml'
 --- tests/qmltests/Dash/tst_Card.qml	2014-09-04 15:44:48 +0000
 +++ tests/qmltests/Dash/tst_Card.qml	2014-09-29 11:41:25 +0000
@@ -17,6 +17,7 @@
  import QtQuick 2.0
  import QtTest 1.0
  import Ubuntu.Components 0.1
++import Ubuntu.Connectivity 1.0
  import Unity.Test 0.1 as UT
  import "../../../qml/Dash"
  import "CardHelpers.js" as Helpers
@@ -205,6 +206,11 @@
          property Item backgroundImage: findChild(card, "backgroundImage")
          property Item mascotImage: findChild(card, "mascotImage");
++        function init() {
++            loader.visible = true;
++            NetworkingStatus.limitedBandwith = false;
++        }
++
          function cleanup() {
              selector.selectedIndex = -1;
+         }
@@ -566,5 +572,25 @@
                  verify((card.width - titleToCard.x - titleToCard.width) === units.gu(1));
+             }
+         }
++
++        function test_load_images_visibility_network_data() {
++            return [
++                { tag: "Visible, network", visible: true, limitedBandwith: false },
++                { tag: "Visible, no network", visible: true, limitedBandwith: true },
++                { tag: "Not Visible, network", visible: false, limitedBandwith: false },
++                { tag: "Not Visible, no network", visible: false, limitedBandwith: true }
++            ];
++        }
++
++        function test_load_images_visibility_network(data) {
++            loader.visible = data.visible;
++            NetworkingStatus.limitedBandwith = data.limitedBandwith;
++
++            selector.selectedIndex = 0;
++            waitForRendering(selector);
++            waitForRendering(card);
++
++            verify(data.visible || !data.limitedBandwith || artImage.source == "");
++        }
+     }
+ }
 === modified file 'tests/qmltests/Dash/tst_Dash.qml'
 --- tests/qmltests/Dash/tst_Dash.qml	2014-09-08 14:14:12 +0000
 +++ tests/qmltests/Dash/tst_Dash.qml	2014-09-29 11:41:25 +0000
@@ -55,6 +55,16 @@
              scopes.load();
              tryCompare(dashContentList, "currentIndex", 0);
              tryCompare(dashContentList, "count", 6);
++            tryCompare(scopes, "loaded", true);
++            tryCompareFunction(function() {
++                var mockScope1Loader = findChild(dash, "MockScope1 loader");
++                return mockScope1Loader && mockScope1Loader.item != null; },
++                true, 15000);
++            tryCompareFunction(function() {
++                var mockScope1Loader = findChild(dash, "MockScope1 loader");
++                return mockScope1Loader && mockScope1Loader.status === Loader.Ready; },
++                true, 15000);
++            waitForRendering(findChild(dash, "MockScope1 loader").item);
+         }
          function get_scope_data() {
@@ -92,15 +102,6 @@
+         }
          function test_dash_overview_show_select_same_favorite() {
--            // Wait for stuff to be loaded
--            tryCompare(scopes, "loaded", true);
--            var dashContentList = findChild(dash, "dashContentList");
--            tryCompare(dashContentList, "count", 6);
--            tryCompareFunction(function() {
--                var mockScope1Loader = findChild(dash, "MockScope1 loader");
--                return mockScope1Loader && mockScope1Loader.item != null; },
--                true);
--
              // Show the overview
              touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, dash.height - units.gu(18));
              var overviewController = findInvisibleChild(dash, "overviewController");
@@ -121,18 +122,12 @@
              // Make sure animation went back
              tryCompare(overviewController, "progress", 0);
++
++            var dashContentList = findChild(dash, "dashContentList");
              compare(dashContentList.currentIndex, 0);
+         }
          function test_dash_overview_show_select_different_favorite() {
--            // Wait for stuff to be loaded
--            tryCompare(scopes, "loaded", true);
--            var dashContentList = findChild(dash, "dashContentList");
--            tryCompare(dashContentList, "count", 6);
--            tryCompareFunction(function() { return findChild(dash, "MockScope1 loader") != null; }, true);
--            var mockScope1Loader = findChild(dash, "MockScope1 loader");
--            tryCompare(mockScope1Loader, "status", Loader.Ready);
--
              // Show the overview
              touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, dash.height - units.gu(18));
              var overviewController = findInvisibleChild(dash, "overviewController");
@@ -153,19 +148,11 @@
              // Make sure animation went back
              tryCompare(overviewController, "progress", 0);
++            var dashContentList = findChild(dash, "dashContentList");
              compare(dashContentList.currentIndex, 1);
+         }
          function test_dash_overview_all_temp_scope_done_from_all() {
--            // Wait for stuff to be loaded
--            tryCompare(scopes, "loaded", true);
--            var dashContentList = findChild(dash, "dashContentList");
--            tryCompare(dashContentList, "count", 6);
--            tryCompareFunction(function() {
--                var mockScope1Loader = findChild(dash, "MockScope1 loader");
--                return mockScope1Loader && mockScope1Loader.item != null; },
--                true);
--
              // Show the overview
              touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, dash.height - units.gu(18));
              var overviewController = findInvisibleChild(dash, "overviewController");
@@ -227,20 +214,13 @@
              tryCompare(overviewController, "progress", 0);
              // Original list is still on 0
++            var dashContentList = findChild(dash, "dashContentList");
              compare(dashContentList.currentIndex, 0);
+         }
          function test_temp_scope_dash_overview_all_search_temp_scope_favorite_from_all() {
--            // Wait for stuff to be loaded
--            tryCompare(scopes, "loaded", true);
--            var dashContentList = findChild(dash, "dashContentList");
--            tryCompare(dashContentList, "count", 6);
--            tryCompareFunction(function() {
--                var mockScope1Loader = findChild(dash, "MockScope1 loader");
--                return mockScope1Loader && mockScope1Loader.item != null; },
--                true);
--
              // Swipe right to Apps scope
++            var dashContentList = findChild(dash, "dashContentList");
              touchFlick(dash, dash.width - 1, units.gu(1), dash.width - units.gu(10), units.gu(1));
              tryCompare(dashContentList, "contentX", dashContentList.width);
              tryCompare(dashContentList, "currentIndex", 1);
@@ -249,8 +229,7 @@
              var categoryListView = findChild(dashContentList.currentItem, "categoryListView");
              var dashCategory2 = findChild(categoryListView, "dashCategory2");
              tryCompareFunction(function() {
--                    var d = findChild(dashCategory2, "delegate2");
--                    if (d) return true;
++                    if (dashCategory2.y < 200) return true;
                      categoryListView.contentY += 100;
                      return false;
                  }, true);
@@ -340,8 +319,6 @@
+         }
          function test_processing_indicator() {
--            tryCompare(scopes, "loaded", true);
--
              var processingIndicator = findChild(dash, "processingIndicator");
              verify(processingIndicator, "Can't find the processing indicator.");
 === modified file 'tests/qmltests/Dash/tst_DashContent.qml'
 --- tests/qmltests/Dash/tst_DashContent.qml	2014-08-27 07:09:39 +0000
 +++ tests/qmltests/Dash/tst_DashContent.qml	2014-09-29 11:41:25 +0000
@@ -70,7 +70,17 @@
          function loadScopes() {
              scopeLoadedSpy.clear();
              scopesModel.load();
--            tryCompare(scopeLoadedSpy, "count", 6);
++            tryCompare(scopeLoadedSpy, "count", 6, 15000);
++            tryCompare(scopesModel, "loaded", true);
++            tryCompareFunction(function() {
++                var mockScope1Loader = findChild(shell, "MockScope1 loader");
++                return mockScope1Loader && mockScope1Loader.item != null; },
++                true, 15000);
++            tryCompareFunction(function() {
++                var mockScope1Loader = findChild(shell, "MockScope1 loader");
++                return mockScope1Loader && mockScope1Loader.status === Loader.Ready; },
++                true, 15000);
++            waitForRendering(findChild(shell, "MockScope1 loader").item);
+         }
          function init() {
@@ -467,6 +477,9 @@
              var navigationListView = findChild(dashAltNavigationButton, "navigationListView");
              tryCompare(navigationListView.currentItem.navigation, "loaded", true);
++            var blackRect = findChild(dashNavigation, "blackRect");
++            tryCompare(blackRect, "opacity", 0.5);
++
              mouseClick(dashNavigation, dashNavigationButton.x, 0);
              compare(dashNavigationButton.showList, false);
              compare(dashAltNavigationButton.showList, false);
 === modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
 --- tests/qmltests/Dash/tst_GenericScopeView.qml	2014-09-23 08:56:29 +0000
 +++ tests/qmltests/Dash/tst_GenericScopeView.qml	2014-09-29 11:41:25 +0000
@@ -82,18 +82,19 @@
                  spy.signalName = "";
+             }
--            function scrollToCategory(category) {
++            function scrollToCategory(categoryName) {
                  var categoryListView = findChild(genericScopeView, "categoryListView");
                  tryCompareFunction(function() {
--                    if (findChild(genericScopeView, category)) return true;
++                    var category = findChild(genericScopeView, categoryName);
++                    if (category && category.y > 0 && category.y < genericScopeView.height) return true;
                      mouseFlick(genericScopeView, genericScopeView.width/2, genericScopeView.height,
                                 genericScopeView.width/2, genericScopeView.y)
                      tryCompare(categoryListView, "moving", false);
--                    return findChild(genericScopeView, category) !== null;
++                    return false;
                  }, true);
                  tryCompareFunction(function() { return findChild(genericScopeView, "delegate0") !== null; }, true);
--                return findChild(genericScopeView, category);
++                return findChild(genericScopeView, categoryName);
+             }
              function scrollToEnd()
@@ -283,7 +284,7 @@
                  if (category === undefined) category = 0;
                  if (delegate === undefined) delegate = 0;
                  tryCompareFunction(function() {
--                                        var cardGrid = findChild(genericScopeView, category);
++                                        var cardGrid = findChild(genericScopeView, "dashCategory"+category);
                                          if (cardGrid != null) {
                                              var tile = findChild(cardGrid, "delegate"+delegate);
                                              return tile != null;
@@ -291,7 +292,7 @@
                                          return false;
                                      },
                                      true);
--                var tile = findChild(findChild(genericScopeView, category), "delegate"+delegate);
++                var tile = findChild(findChild(genericScopeView, "dashCategory"+category), "delegate"+delegate);
                  mouseClick(tile, tile.width / 2, tile.height / 2);
                  tryCompare(testCase.subPageLoader, "open", true);
                  tryCompare(testCase.subPageLoader, "x", 0);
 === modified file 'tests/utils/modules/Unity/Test/UnityTestCase.qml'
 --- tests/utils/modules/Unity/Test/UnityTestCase.qml	2014-08-08 11:23:57 +0000
 +++ tests/utils/modules/Unity/Test/UnityTestCase.qml	2014-09-29 11:41:25 +0000
@@ -178,9 +178,10 @@
      // Keeps executing a given parameter-less function until it returns the given
      // expected result or the timemout is reached (in which case a test failure
      // is generated)
--    function tryCompareFunction(func, expectedResult) {
++    function tryCompareFunction(func, expectedResult, timeout) {
          var timeSpent = 0
--        var timeout = 5000
++        if (timeout === undefined)
++            timeout = 5000;
          var success = false
          var actualResult
          while (timeSpent < timeout && !success) {