Merge lp:~saviq/unity8/initial-see-all into lp:unity8

[Michał Sawicz]

Move expansion button from section header to category footer.

 * Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~saviq/unity8/drop-filtergrid/+merge/226415

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

 * If you changed the UI, has there been a design review?
Will do in silo.

[lp:~saviq/unity8/initial-see-all]

1057. By Michał Sawicz on 2014-07-11

{}++

[Michal Hruby (mhr3)]

Saw a strange offset issue after collapsing a category, but I wasn't able to reproduce it since (not even sure whether it's this branch that introduces it).

Otherwise it's working fine.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1057
http://jenkins.qa.ubuntu.com/job/unity8-ci/3408/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1871
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/412
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/502
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/502
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/502/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/502
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2131
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2968
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2968/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9707

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1057
http://jenkins.qa.ubuntu.com/job/unity8-ci/3418/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1898
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/422
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/512
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/512
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/512/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/512
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2153
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2999
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2999/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9732

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

review: Needs Fixing (continuous-integration)

[lp:~saviq/unity8/initial-see-all]

1058. By Michał Sawicz on 2014-07-18

Merge trunk.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1058
http://jenkins.qa.ubuntu.com/job/unity8-ci/3480/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2175
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/482
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/574
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/574
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/574/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/574
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2391
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3341
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3341/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10060

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

review: Needs Fixing (continuous-integration)

[lp:~saviq/unity8/initial-see-all]

1059. By Michał Sawicz on 2014-07-21

Merge drop-filtergrid.

1060. By Michał Sawicz on 2014-07-21

Fix (or bring back to what they were before) the top/bottom gradients.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1059
http://jenkins.qa.ubuntu.com/job/unity8-ci/3499/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2235
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/501
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/593
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/593
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/593/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/593
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2443
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3419
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3419/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10137

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1060
http://jenkins.qa.ubuntu.com/job/unity8-ci/3508/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2261
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/510
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/602
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/602
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/602/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/602
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2462
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3450
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3450/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10164

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1060
http://jenkins.qa.ubuntu.com/job/unity8-ci/3517/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2274
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/518
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/611
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/611
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/611/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/611
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2474
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3468
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3468/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10182

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

* Did you perform an exploratory manual test run of the code change and any related functionality?
Yes, looks good

 * Did CI run pass? If not, please explain why.
No, weirdness in autopilot run

review: Approve

[lp:~saviq/unity8/initial-see-all]

1061. By Michał Sawicz on 2014-07-22

Merge drop-filtergrid.

1062. By Michał Sawicz on 2014-07-24

Fix emulator.

1063. By Michał Sawicz on 2014-07-24

Merge drop-filtergrid.

=== modified file 'po/unity8.pot'
--- po/unity8.pot	2014-07-07 11:15:37 +0000
+++ po/unity8.pot	2014-07-24 14:47:51 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: unity8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-07 12:15+0100\n"
+"POT-Creation-Date: 2014-07-11 14:59+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -80,10 +80,6 @@
 msgid "OK"
 msgstr ""
 
-#: qml/Components/PageHeader.qml:366
-msgid "Recent searches"
-msgstr ""
-
 #: qml/Components/PassphraseLockscreen.qml:60
 #, qt-format
 msgid "Hello %1"
@@ -105,7 +101,7 @@
 msgid "See more"
 msgstr ""
 
-#: qml/Components/SeeMore.qml:58
+#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
 msgid "See less"
 msgstr ""
 
@@ -113,6 +109,10 @@
 msgid "Recent"
 msgstr ""
 
+#: qml/Dash/GenericScopeView.qml:330
+msgid "See all"
+msgstr ""
+
 #: qml/Dash/Previews/PreviewActionCombo.qml:34
 msgid "More..."
 msgstr ""
@@ -121,15 +121,15 @@
 msgid "Less..."
 msgstr ""
 
-#: qml/Dash/Previews/PreviewRatingInput.qml:82
+#: qml/Dash/Previews/PreviewRatingInput.qml:81
 msgid "Rate this"
 msgstr ""
 
-#: qml/Dash/Previews/PreviewRatingInput.qml:128
+#: qml/Dash/Previews/PreviewRatingInput.qml:126
 msgid "Add a review"
 msgstr ""
 
-#: qml/Dash/Previews/PreviewRatingInput.qml:168
+#: qml/Dash/Previews/PreviewRatingInput.qml:166
 msgid "Send"
 msgstr ""
 
@@ -165,6 +165,14 @@
 msgid "Please enter SIM PIN"
 msgstr ""
 
+#: qml/Panel/ActiveCallHint.qml:77
+msgid "Tap to return to call..."
+msgstr ""
+
+#: qml/Panel/ActiveCallHint.qml:90
+msgid "Conference"
+msgstr ""
+
 #: qml/Panel/Indicators/MenuItemFactory.qml:583
 msgid "In queue…"
 msgstr ""

=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2014-07-24 14:47:51 +0000
+++ qml/Dash/GenericScopeView.qml	2014-07-24 14:47:51 +0000
@@ -260,13 +260,13 @@
                             var shouldExpand = categoryId === categoryView.expandedCategoryId;
                             if (shouldExpand != baseItem.expanded) {
                                 // If the filter animation will be seen start it, otherwise, just flip the switch
-                                var shrinkingVisible = !shouldExpand && y + item.collapsedHeight < categoryView.height;
+                                var shrinkingVisible = !shouldExpand && y + item.collapsedHeight + seeAll.height < categoryView.height;
                                 var growingVisible = shouldExpand && y + height < categoryView.height;
                                 if (!previewListView.open || shouldExpand) {
                                     var animate = shrinkingVisible || growingVisible;
                                     baseItem.expand(shouldExpand, animate)
                                     if (shouldExpand && !previewListView.open) {
-                                        categoryView.maximizeVisibleArea(index, item.expandedHeight);
+                                        categoryView.maximizeVisibleArea(index, item.expandedHeight + seeAll.height);
                                     }
                                 }
                             }
@@ -303,35 +303,68 @@
                             item.displayMarginEnd = -baseItem.height;
                         } else {
                             item.displayMarginBeginning = -Math.max(-baseItem.y, 0);
-                            item.displayMarginEnd = -Math.max(baseItem.height - categoryView.height + baseItem.y, 0)
+                            item.displayMarginEnd = -Math.max(baseItem.height - seeAll.height
+                                                              - categoryView.height + baseItem.y, 0)
                         }
                     }
                 }
-
-                Image {
-                    visible: index != 0
-                    anchors {
-                        top: parent.top
-                        left: parent.left
-                        right: parent.right
-                    }
-                    fillMode: Image.Stretch
-                    source: "graphics/dash_divider_top_lightgrad.png"
-                    z: -1
-                }
-
-                Image {
-                    // FIXME Should not rely on model.count but view.count, but ListViewWithPageHeader doesn't expose it yet.
-                    visible: index != categoryView.model.count - 1
-                    anchors {
-                        bottom: parent.bottom
-                        left: parent.left
-                        right: parent.right
-                    }
-                    fillMode: Image.Stretch
-                    source: "graphics/dash_divider_top_darkgrad.png"
-                    z: -1
-                }
+            }
+
+            AbstractButton {
+                id: seeAll
+                objectName: "seeAll"
+                anchors {
+                    top: rendererLoader.bottom
+                    left: parent.left
+                    right: parent.right
+                }
+                height: baseItem.expandable ? seeAllLabel.font.pixelSize + units.gu(6) : 0
+
+                onClicked: {
+                    if (categoryView.expandedCategoryId != baseItem.category) {
+                        categoryView.expandedCategoryId = baseItem.category;
+                    } else {
+                        categoryView.expandedCategoryId = "";
+                    }
+                }
+
+                Label {
+                    id: seeAllLabel
+                    text: baseItem.expanded ? i18n.tr("See less") : i18n.tr("See all")
+                    anchors {
+                        centerIn: parent
+                        verticalCenterOffset: units.gu(-0.5)
+                    }
+                    fontSize: "small"
+                    font.weight: Font.Bold
+                    color: scopeStyle ? scopeStyle.foreground : "grey"
+                    visible: baseItem.expandable
+                }
+            }
+
+            Image {
+                visible: index != 0
+                anchors {
+                    top: parent.top
+                    left: parent.left
+                    right: parent.right
+                }
+                fillMode: Image.Stretch
+                source: "graphics/dash_divider_top_lightgrad.png"
+                z: -1
+            }
+
+            Image {
+                // FIXME Should not rely on model.count but view.count, but ListViewWithPageHeader doesn't expose it yet.
+                visible: index != categoryView.model.count - 1
+                anchors {
+                    bottom: seeAll.bottom
+                    left: parent.left
+                    right: parent.right
+                }
+                fillMode: Image.Stretch
+                source: "graphics/dash_divider_top_darkgrad.png"
+                z: -1
             }
         }
 
@@ -342,17 +375,6 @@
             width: categoryView.width
             text: section
             textColor: scopeStyle ? scopeStyle.foreground : "grey"
-            image: {
-                if (delegate && delegate.expandable)
-                    return delegate.expanded ? "graphics/header_handlearrow2.png" : "graphics/header_handlearrow.png"
-                return "";
-            }
-            onClicked: {
-                if (categoryView.expandedCategoryId != delegate.category)
-                    categoryView.expandedCategoryId = delegate.category;
-                else
-                    categoryView.expandedCategoryId = "";
-            }
         }
 
         pageHeader: PageHeader {

=== modified file 'tests/autopilot/unity8/shell/emulators/dash.py'
--- tests/autopilot/unity8/shell/emulators/dash.py	2014-07-24 14:47:51 +0000
+++ tests/autopilot/unity8/shell/emulators/dash.py	2014-07-24 14:47:51 +0000
@@ -209,7 +209,7 @@
 
         result = []
         for card in application_cards:
-            if card.objectName != 'cardToolCard':
+            if card.objectName not in ('cardToolCard', 'seeAll'):
                 result.append(card.title)
         return result
 

=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
--- tests/qmltests/Dash/tst_GenericScopeView.qml	2014-07-24 14:47:51 +0000
+++ tests/qmltests/Dash/tst_GenericScopeView.qml	2014-07-24 14:47:51 +0000
@@ -104,53 +104,50 @@
                 tryCompare(genericScopeView.scope, "searchQuery", "test")
             }
 
-            function test_filter_expand_collapse() {
+            function test_expand_collapse() {
                 tryCompareFunction(function() { return findChild(genericScopeView, "dashSectionHeader0") != null; }, true);
 
-                var header = findChild(genericScopeView, "dashSectionHeader0")
                 var category = findChild(genericScopeView, "dashCategory0")
+                var seeAll = findChild(category, "seeAll")
 
-                waitForRendering(header);
+                waitForRendering(seeAll);
                 verify(category.expandable);
                 verify(!category.expanded);
 
                 var initialHeight = category.height;
-                var middleHeight;
-                mouseClick(header, header.width / 2, header.height / 2);
-                tryCompareFunction(function() { middleHeight = category.height; return category.height > initialHeight; }, true);
-                tryCompare(category, "expanded", true);
-                tryCompareFunction(function() { return category.height > middleHeight; }, true);
+                mouseClick(seeAll, seeAll.width / 2, seeAll.height / 2);
+                verify(category.expanded);
+                tryCompareFunction(function() { return category.height > initialHeight; }, true);
 
-                mouseClick(header, header.width / 2, header.height / 2);
-                verify(category.expandable);
-                tryCompare(category, "expanded", false);
+                mouseClick(seeAll, seeAll.width / 2, seeAll.height / 2);
+                verify(!category.expanded);
             }
 
-            function test_filter_expand_expand_collapse() {
+            function test_expand_expand_collapse() {
                 // wait for the item to be there
                 tryCompareFunction(function() { return findChild(genericScopeView, "dashSectionHeader2") != null; }, true);
 
                 var categoryListView = findChild(genericScopeView, "categoryListView");
                 categoryListView.contentY = categoryListView.height;
 
-                var header2 = findChild(genericScopeView, "dashSectionHeader2")
                 var category2 = findChild(genericScopeView, "dashCategory2")
+                var seeAll2 = findChild(category2, "seeAll")
 
-                waitForRendering(header2);
+                waitForRendering(seeAll2);
                 verify(category2.expandable);
                 verify(!category2.expanded);
 
-                mouseClick(header2, header2.width / 2, header2.height / 2);
+                mouseClick(seeAll2, seeAll2.width / 2, seeAll2.height / 2);
                 tryCompare(category2, "expanded", true);
 
                 categoryListView.positionAtBeginning();
 
-                var header0 = findChild(genericScopeView, "dashSectionHeader0")
                 var category0 = findChild(genericScopeView, "dashCategory0")
-                mouseClick(header0, header0.width / 2, header0.height / 2);
+                var seeAll0 = findChild(category0, "seeAll")
+                mouseClick(seeAll0, seeAll0.width / 2, seeAll0.height / 2);
                 tryCompare(category0, "expanded", true);
                 tryCompare(category2, "expanded", false);
-                mouseClick(header0, header0.width / 2, header0.height / 2);
+                mouseClick(seeAll0, seeAll0.width / 2, seeAll0.height / 2);
                 tryCompare(category0, "expanded", false);
                 tryCompare(category2, "expanded", false);
             }
@@ -163,11 +160,11 @@
                 shell.width = units.gu(20)
                 var categoryListView = findChild(genericScopeView, "categoryListView");
                 categoryListView.contentY = units.gu(20);
-                var header0 = findChild(genericScopeView, "dashSectionHeader0")
-                mouseClick(header0, header0.width / 2, header0.height / 2);
+                var seeAll = findChild(category, "seeAll")
+                mouseClick(seeAll, seeAll.width / 2, seeAll.height / 2);
                 tryCompare(category, "expanded", true);
                 tryCompareFunction(function() { return category.item.height == genericScopeView.height - category.item.displayMarginBeginning - category.item.displayMarginEnd; }, true);
-                mouseClick(header0, header0.width / 2, header0.height / 2);
+                mouseClick(seeAll, seeAll.width / 2, seeAll.height / 2);
                 tryCompare(category, "expanded", false);
             }