Merge lp:~aacid/unity8/avila_apps_scope into lp:unity8

[Albert Astals Cid]

Better looking application scopes for wide screens

Removes the maximum number of columns as discussed with Design it doesn't make sense and made the cards a bit wider

* 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?
Paty says "Looks alright I guess"

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2115
http://jenkins.qa.ubuntu.com/job/unity8-ci/7053/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6006
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/468/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1758
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/461
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1653
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1653
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/460
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/459
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4641
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6017
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6017/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26605
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/216/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/466
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/466/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26606

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:2115
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/37/
Executed test runs:

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

review: Approve (continuous-integration)

[Michael Terry (mterry)]

LGTM. Can't argue with "Looks alright I guess"

 * 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.
 Yes!

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

review: Approve

[Albert Astals Cid (aacid)]

Actually some of the tests failed, I would not listen to unity8-ci-bot just yet.

[lp:~aacid/unity8/avila_apps_scope]

2116. By Albert Astals Cid on 2016-01-14

Merge unity8

2117. By Albert Astals Cid on 2016-01-14

Fix genericscopeview tests now that the 6 column limit has disappeared

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

PASSED: Continuous integration, rev:2117
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/63/
Executed test runs:

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2117
http://jenkins.qa.ubuntu.com/job/unity8-ci/7062/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6019
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/477/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1767
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/470
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1662
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1662
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/469
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/468
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4648
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6030
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6030/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26641
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/222/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/475
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/475/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26642

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

review: Needs Fixing (continuous-integration)

[lp:~aacid/unity8/avila_apps_scope]

2118. By Albert Astals Cid on 2016-01-22

Specify min spacing for the apps scope on wide screens

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

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

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2118
http://jenkins.qa.ubuntu.com/job/unity8-ci/7130/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6142
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/545/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1835
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/538
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1730
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1730
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/537
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/536
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4739
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6153
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6153/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26941
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/281/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/543
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/543/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26942

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

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

Verified it doesn't change small size screens (like phones). Visuals on larger screens (flo & frieza) approved by Paty and Vesa.

 * 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.

as much as we'd expect

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

yes

review: Approve

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

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

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

review: Needs Fixing (continuous-integration)

=== modified file 'qml/Components/ResponsiveGridView.qml'
--- qml/Components/ResponsiveGridView.qml	2015-11-20 15:36:42 +0000
+++ qml/Components/ResponsiveGridView.qml	2016-01-22 14:59:25 +0000
@@ -18,12 +18,10 @@
 import Ubuntu.Components 1.3
 
 /*
-   Essentially a GridView where you can specify the maximum number of columns it can have.
+   Essentially a GridView
  */
 Item {
     property int minimumHorizontalSpacing: units.gu(0.5)
-    // property int minimumNumberOfColumns: 2 // FIXME: not implemented
-    property int maximumNumberOfColumns: 6
     readonly property int columns: gridView.columns
     property alias verticalSpacing: gridView.verticalSpacing
     readonly property alias margins: gridView.margin
@@ -81,7 +79,7 @@
         }
 
         property real allocatableHorizontalSpace: parent.width - columns * delegateWidth
-        property int columns: Math.min(columnsForSpacing(minimumHorizontalSpacing), maximumNumberOfColumns)
+        property int columns: columnsForSpacing(minimumHorizontalSpacing)
         property real horizontalSpacing: spacingForColumns(columns)
         property real verticalSpacing: horizontalSpacing
         property int margin: allocatableHorizontalSpace - columns * horizontalSpacing

=== modified file 'qml/Dash/CardGrid.qml'
--- qml/Dash/CardGrid.qml	2015-11-20 16:33:38 +0000
+++ qml/Dash/CardGrid.qml	2016-01-22 14:59:25 +0000
@@ -26,6 +26,7 @@
     }
     property string artShapeStyle: "inset";
     property string backgroundShapeStyle: "inset";
+    property alias minimumHorizontalSpacing: grid.minimumHorizontalSpacing
 
     expandedHeight: grid.totalContentHeight
     collapsedHeight: Math.min(grid.contentHeightForRows(collapsedRows, grid.cellHeight), expandedHeight)

=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2015-11-20 16:33:38 +0000
+++ qml/Dash/GenericScopeView.qml	2016-01-22 14:59:25 +0000
@@ -365,7 +365,8 @@
                             // Yeah, hackish :/
                             if (scopeView.width > units.gu(45)) {
                                 if (scopeView.width >= units.gu(70)) {
-                                    cardTool.cardWidth = units.gu(9);
+                                    cardTool.cardWidth = units.gu(11);
+                                    item.minimumHorizontalSpacing = units.gu(5)
                                 } else {
                                     cardTool.cardWidth = units.gu(10);
                                 }

=== modified file 'tests/mocks/Unity/fake_categories.cpp'
--- tests/mocks/Unity/fake_categories.cpp	2015-11-26 13:51:53 +0000
+++ tests/mocks/Unity/fake_categories.cpp	2016-01-22 14:59:25 +0000
@@ -141,7 +141,7 @@
     ResultsModel *result = m_resultsModels[row];
     if (!result) {
         Categories *that = const_cast<Categories*>(this);
-        result = new ResultsModel(15, row, that);
+        result = new ResultsModel(25, row, that);
         m_resultsModels[row] = result;
     }
     return result;

=== modified file 'tests/qmltests/Components/tst_ResponsiveGridView.qml'
--- tests/qmltests/Components/tst_ResponsiveGridView.qml	2015-07-15 15:07:19 +0000
+++ tests/qmltests/Components/tst_ResponsiveGridView.qml	2016-01-22 14:59:25 +0000
@@ -33,12 +33,6 @@
         anchors.top: parent.top
         anchors.right: parent.right
         ListItem.ValueSelector {
-            id: maxColumnsSelector
-            text: "maximumNumberOfColumns"
-            values: [2,4,8,13,1000]
-            selectedIndex: 1
-        }
-        ListItem.ValueSelector {
             id: minHSpacingSelector
             text: "minHorizontalSpacing"
             values: [0,units.gu(2),units.gu(8),units.gu(25)]
@@ -86,8 +80,6 @@
             minimumHorizontalSpacing:
                 minHSpacingSelector.values[minHSpacingSelector.selectedIndex]
             verticalSpacing: units.gu(2)
-            maximumNumberOfColumns:
-                maxColumnsSelector.values[maxColumnsSelector.selectedIndex]
             delegateWidth: units.gu(6)
             delegateHeight: units.gu(6)
 
@@ -123,31 +115,6 @@
         name: "ResponsiveGridView"
         when: windowShown
 
-        function test_maximumNumberOfColumns_data() {
-            var data = new Array()
-
-            data.push({selectedIndex: 0, maxColumnCount:2, columnCount: 2})
-            data.push({selectedIndex: 1, maxColumnCount:4, columnCount: 4})
-            data.push({selectedIndex: 2, maxColumnCount:8, columnCount: 8})
-            data.push({selectedIndex: 4, maxColumnCount:1000, columnCount: 13})
-
-            return data
-        }
-
-        /* Change ResponsiveGridView's maximumNumberOfColumns property and check
-           that the resulting number of columns matches expectations */
-        function test_maximumNumberOfColumns(data) {
-            minHSpacingSelector.selectedIndex = 0
-
-            // sanity checks
-            compare(maxColumnsSelector.values[data.selectedIndex], data.maxColumnCount)
-            compare(minHSpacingSelector.values[0], 0)
-
-            maxColumnsSelector.selectedIndex = data.selectedIndex
-            tryCompareFunction(countGridDelegatesOnFirstRow, data.columnCount);
-            compare(grid.columns, data.columnCount)
-        }
-
         function test_minimumHorizontalSpacing_data() {
             var data = new Array()
 
@@ -162,10 +129,7 @@
         /* Change ResponsiveGridView's minimumHorizontalSpacing property and check
            that the resulting number of columns matches expectations */
         function test_minimumHorizontalSpacing(data) {
-            maxColumnsSelector.selectedIndex = 4
-
             // sanity checks
-            compare(maxColumnsSelector.values[4], 1000)
             compare(minHSpacingSelector.values[data.selectedIndex], data.minHSpacing)
 
             minHSpacingSelector.selectedIndex = data.selectedIndex

=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
--- tests/qmltests/Dash/tst_GenericScopeView.qml	2015-12-16 14:35:14 +0000
+++ tests/qmltests/Dash/tst_GenericScopeView.qml	2016-01-22 14:59:25 +0000
@@ -238,7 +238,7 @@
 
                 openPreview(4, 0);
 
-                compare(testCase.subPageLoader.count, 12, "There should only be 12 items in preview.");
+                compare(testCase.subPageLoader.count, 16, "There should only be 16 items in preview.");
 
                 closePreview();
             }
@@ -413,7 +413,7 @@
                 var previewListViewList = findChild(subPageLoader.item, "listView");
 
                 // flick to the next previews
-                tryCompare(testCase.subPageLoader, "count", 15);
+                tryCompare(testCase.subPageLoader, "count", 25);
                 for (var i = 1; i < testCase.subPageLoader.count; ++i) {
                     mouseFlick(testCase.subPageLoader.item, testCase.subPageLoader.width - units.gu(1),
                                                 testCase.subPageLoader.height / 2,
@@ -487,7 +487,7 @@
                 mockScope.setName("Mock Scope");
                 mockScope.categories.setCount(2);
                 mockScope.categories.resultModel(0).setResultCount(50);
-                mockScope.categories.resultModel(1).setResultCount(15);
+                mockScope.categories.resultModel(1).setResultCount(25);
                 mockScope.categories.setLayout(0, "grid");
                 mockScope.categories.setLayout(1, "grid");
                 mockScope.categories.setHeaderLink(0, "");
@@ -529,7 +529,7 @@
                 mockScope.setId("mockScope");
                 mockScope.setName("Mock Scope");
                 mockScope.categories.setCount(2);
-                mockScope.categories.resultModel(0).setResultCount(15);
+                mockScope.categories.resultModel(0).setResultCount(25);
                 mockScope.categories.resultModel(1).setResultCount(50);
                 mockScope.categories.setLayout(0, "grid");
                 mockScope.categories.setLayout(1, "grid");