Merge lp:~aacid/unity8/activtion-progress into lp:unity8

[Albert Astals Cid]

Hook the new scope.activationInProgress property

* Are there any related MPs required for this MP to build/function as expected?
https://code.launchpad.net/~stolowski/unity-api/activation-progress for building
https://code.launchpad.net/~stolowski/unity-scopes-shell/activation-progress for it actually doing things

 * Did you perform an exploratory manual test run of your code change and any related functionality?
kyleN tested this with his scope and confirmed it works

 * 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?
Simple enough, not needed

 * If you changed the UI, has there been a design review?
N/A

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2145
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/226/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/226/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2145
http://jenkins.qa.ubuntu.com/job/unity8-ci/7175/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6262/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/590/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1880/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/583/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1775/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1775/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/582/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/581/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6273/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/588/console

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

review: Needs Fixing (continuous-integration)

[Andrea Cimitan (cimi)]

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

review: Approve

[lp:~aacid/unity8/activtion-progress]

2146. By Albert Astals Cid on 2016-02-19

Merge trunk

=== modified file 'debian/control'
--- debian/control	2016-02-12 00:12:30 +0000
+++ debian/control	2016-02-19 11:49:09 +0000
@@ -134,7 +134,7 @@
          unity-application-impl-13,
          unity-notifications-impl-3,
          unity-plugin-scopes | unity-scopes-impl,
-         unity-scopes-impl-9,
+         unity-scopes-impl-10,
          unity8-fake-env | unity-application-impl,
          ${misc:Depends},
 Breaks: unity8 (<< 7.86),

=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2016-02-04 13:36:51 +0000
+++ qml/Dash/GenericScopeView.qml	2016-02-19 11:49:09 +0000
@@ -47,7 +47,7 @@
         style: scope ? scope.customizations : {}
     }
 
-    readonly property bool processing: scope ? scope.searchInProgress || subPageLoader.processing : false
+    readonly property bool processing: scope ? (scope.searchInProgress || scope.activationInProgress || subPageLoader.processing) : false
 
     signal backClicked()
 

=== modified file 'qml/Dash/ScopesList.qml'
--- qml/Dash/ScopesList.qml	2015-10-26 08:53:52 +0000
+++ qml/Dash/ScopesList.qml	2016-02-19 11:49:09 +0000
@@ -24,7 +24,7 @@
     property var scope: null
 
     // Properties used by parent
-    readonly property bool processing: scope ? scope.searchInProgress : false
+    readonly property bool processing: scope ? (scope.searchInProgress || scope.activationInProgress) : false
 
     // Signals
     signal backClicked()

=== modified file 'tests/mocks/Unity/CMakeLists.txt'
--- tests/mocks/Unity/CMakeLists.txt	2016-01-13 10:11:40 +0000
+++ tests/mocks/Unity/CMakeLists.txt	2016-02-19 11:49:09 +0000
@@ -8,7 +8,7 @@
 add_subdirectory(Screens)
 
 pkg_search_module(GOBJECT gobject-2.0 REQUIRED)
-pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=9)
+pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=10)
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}

=== modified file 'tests/mocks/Unity/fake_scope.cpp'
--- tests/mocks/Unity/fake_scope.cpp	2015-10-14 12:46:35 +0000
+++ tests/mocks/Unity/fake_scope.cpp	2016-02-19 11:49:09 +0000
@@ -87,6 +87,11 @@
     return m_searching;
 }
 
+bool Scope::activationInProgress() const
+{
+    return false;
+}
+
 bool Scope::favorite() const
 {
     return m_favorite;

=== modified file 'tests/mocks/Unity/fake_scope.h'
--- tests/mocks/Unity/fake_scope.h	2015-10-14 12:46:35 +0000
+++ tests/mocks/Unity/fake_scope.h	2016-02-19 11:49:09 +0000
@@ -42,6 +42,7 @@
     QString searchHint() const override;
     QString shortcut() const override;
     bool searchInProgress() const override;
+    bool activationInProgress() const override;
     bool favorite() const override;
     unity::shell::scopes::CategoriesInterface* categories() const override;
     QString searchQuery() const override;