Unity

Merge lp:~aacid/unity/doNotAnimateFilterGrid into lp:unity/phablet

  1. doNotAnimateFilterGrid
  2. Merge into phablet
Proposed by Albert Astals Cid
Status: Merged
Approved by: Michał Sawicz
Approved revision: no longer in the source branch.
Merged at revision: 707
Proposed branch: lp:~aacid/unity/doNotAnimateFilterGrid
Merge into: lp:unity/phablet
Diff against target: 118 lines (+3/-25)
4 files modified
Components/FilterGrid.qml (+0/-4)
tests/qmltests/Components/tst_FilterGrid.qml (+3/-15)
tests/qmltests/Dash/People/tst_PeopleFilterGrid.qml (+0/-3)
tests/qmltests/Dash/tst_FilterGrids.qml (+0/-3)
To merge this branch: bzr merge lp:~aacid/unity/doNotAnimateFilterGrid
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Michał Sawicz Approve
Review via email: mp+165886@code.launchpad.net

Commit message

Don't animate the FilterGrid

To post a comment you must log in.
Revision history for this message
Michał Sawicz (saviq) wrote :

Looks good, we'll bring back the transition for the proper category expansion implementation.

Let's see what CI has to say.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:697
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1056/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/1046
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/931
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/931/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/935
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1701

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1056/rebuild

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-phablet-autolanding/360/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/1060
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/294
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-autolanding/294/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-autolanding/294
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1718/console

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Components/FilterGrid.qml'
2--- Components/FilterGrid.qml 2013-05-02 00:15:36 +0000
3+++ Components/FilterGrid.qml 2013-05-27 13:47:29 +0000
4@@ -55,9 +55,6 @@
5 readonly property alias moving: iconTileGrid.moving
6 readonly property alias pressDelay: iconTileGrid.pressDelay
7
8- // for testing purposes
9- property alias __expansionAnimation: heightAnimation
10-
11 height: childrenRect.height
12
13 ResponsiveGridView {
14@@ -65,7 +62,6 @@
15
16 anchors { left: parent.left; right: parent.right }
17 height: totalContentHeight
18- Behavior on height { NumberAnimation { id: heightAnimation; duration: 200; easing.type: Easing.InOutQuad } }
19 interactive: false
20
21 minimumHorizontalSpacing: units.gu(0.5)
22
23=== modified file 'tests/qmltests/Components/tst_FilterGrid.qml'
24--- tests/qmltests/Components/tst_FilterGrid.qml 2013-05-08 09:51:55 +0000
25+++ tests/qmltests/Components/tst_FilterGrid.qml 2013-05-27 13:47:29 +0000
26@@ -120,34 +120,26 @@
27 when: windowShown
28
29 function test_turningFilterOffShowsAllElements() {
30- compare(countVisibleDelegates(), 6)
31+ tryCompareFunction(countVisibleDelegates, 6)
32
33 filterCheckBox.checked = false
34
35- // wait for animations to complete
36- tryCompare(filterGrid.__expansionAnimation, "running", false)
37- compare(countVisibleDelegates(), 12)
38+ tryCompareFunction(countVisibleDelegates, 12)
39
40 // back to initial state
41 filterCheckBox.checked = true
42- // wait for animations to complete
43- tryCompare(filterGrid.__expansionAnimation, "running", false)
44 }
45
46 function test_collapsedRowCount() {
47 for (var i = 0; i < 4; ++i) {
48 collapsedRowCountSelector.selectedIndex = i
49- // wait for animations to complete
50- tryCompare(filterGrid.__expansionAnimation, "running", false)
51 // We have 3 elements per row.
52 // row count == index + 1
53- compare(countVisibleDelegates(), 3*(i+1))
54+ tryCompareFunction(countVisibleDelegates, 3*(i+1))
55 }
56
57 // back to initial state
58 collapsedRowCountSelector.selectedIndex = 1
59- // wait for animations to complete
60- tryCompare(filterGrid.__expansionAnimation, "running", false)
61 }
62
63 // Checks that the filter toggle button, the one that says "View All (xy)",
64@@ -157,8 +149,6 @@
65
66 for (var i = 0; i < 4; ++i) {
67 collapsedRowCountSelector.selectedIndex = i
68- // wait for animations to complete
69- tryCompare(filterGrid.__expansionAnimation, "running", false)
70 // row count == index + 1
71 // The total number of rows is 4.
72
73@@ -175,8 +165,6 @@
74 // back to initial state
75 collapsedRowCountSelector.selectedIndex = 1
76 expandableCheckBox.checked = true
77- // wait for animations to complete
78- tryCompare(filterGrid.__expansionAnimation, "running", false)
79 }
80
81 function countVisibleDelegates() {
82
83=== modified file 'tests/qmltests/Dash/People/tst_PeopleFilterGrid.qml'
84--- tests/qmltests/Dash/People/tst_PeopleFilterGrid.qml 2013-05-02 00:15:36 +0000
85+++ tests/qmltests/Dash/People/tst_PeopleFilterGrid.qml 2013-05-27 13:47:29 +0000
86@@ -133,18 +133,15 @@
87 }
88
89 function test_columns() {
90- tryCompare(peopleFilterGrid.__expansionAnimation, "running", false)
91 compare(peopleFilterGrid.columns,3)
92 }
93
94 function test_clickCell(data) {
95- tryCompare(peopleFilterGrid.__expansionAnimation, "running", false)
96 tryCompare(peopleFilterGrid, "flicking", false)
97 tryCompare(peopleFilterGrid, "moving", false)
98 signalSpy.clear()
99 wait(peopleFilterGrid.pressDelay > 0 ? peopleFilterGrid.pressDelay : 5)
100 mouseClick(peopleFilterGrid, data.x, data.y)
101- tryCompare(peopleFilterGrid.__expansionAnimation, "running", false)
102 tryCompare(peopleFilterGrid, "flicking", false)
103 tryCompare(peopleFilterGrid, "moving", false)
104 compare(signalSpy.count, 1)
105
106=== modified file 'tests/qmltests/Dash/tst_FilterGrids.qml'
107--- tests/qmltests/Dash/tst_FilterGrids.qml 2013-05-22 11:51:49 +0000
108+++ tests/qmltests/Dash/tst_FilterGrids.qml 2013-05-27 13:47:29 +0000
109@@ -126,9 +126,6 @@
110 gridView.forceLayout();
111 waitForRendering(gridView);
112
113- // Wait until the expandinganimation is finished
114- tryCompare(gridLoader.item.__expansionAnimation, "running", false)
115-
116 // Click item 1
117 var tile1 = findChild(gridLoader.item, "delegate1");
118 verify(tile1 !== undefined, "delegate1 wasn't found");

Subscribers

People subscribed via source and target branches