Merge into trunk : appdrawer-direct-search : Code : Unity 8

Status:	Merged
Approved by:	Michael Zanetti on 2017-01-18
Approved revision:	2744
Merged at revision:	2786
Proposed branch:	lp:~lukas-kde/unity8/appdrawer-direct-search
Merge into:	lp:unity8
Diff against target:	139 lines (+31/-8) 4 files modified qml/Launcher/Drawer.qml (+9/-0) qml/Launcher/Launcher.qml (+4/-1) tests/mocks/Unity/Launcher/MockAppDrawerModel.cpp (+0/-1) tests/qmltests/Launcher/tst_Drawer.qml (+18/-6)
To merge this branch:	bzr merge lp:~lukas-kde/unity8/appdrawer-direct-search
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration	2016-12-14	Approve on 2017-01-17
Michael Zanetti (community)		2016-12-14	Approve on 2017-01-10
Review via email: mp+313240@code.launchpad.net

Michael Zanetti (mzanetti) wrote on 2016-12-07: Posted in a previous version of this proposal

#

one small bug:

* reveal the drawer, search something
* hide the drawer
* reveal the drawer again, previous search text is preselected
* start typing

=> text will be prepended to the previous text but it should replace the preselected text instead

review: Needs Fixing

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-12-07: Posted in a previous version of this proposal

#

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

review: Approve (continuous-integration)

Michael Zanetti (mzanetti) wrote on 2016-12-07: Posted in a previous version of this proposal

#

can you move the test to tst_Drawer.qml instead? There's already a dragDrawerIntoView()

review: Needs Fixing

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-12-07: Posted in a previous version of this proposal

#

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

review: Approve (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-12-07: Posted in a previous version of this proposal

#

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

review: Approve (continuous-integration)

Lukáš Tinkl (lukas-kde) wrote on 2016-12-08: Posted in a previous version of this proposal

#

> can you move the test to tst_Drawer.qml instead? There's already a
> dragDrawerIntoView()

Done

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-12-08: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-12-08: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-12-08: Posted in a previous version of this proposal

#

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

review: Approve (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-12-08: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Michael Zanetti (mzanetti) wrote on 2016-12-13: Posted in a previous version of this proposal

#

it seems the test is failing in ci

review: Needs Fixing

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-12-13: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2016-12-14: Posted in a previous version of this proposal

#

Text conflict in qml/Launcher/Launcher.qml
1 conflicts encountered.

Lukáš Tinkl (lukas-kde) wrote on 2016-12-14:

#

Merged, resolved the conflict and resubmitted against trunk

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-12-14:

#

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-12-14:

#

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-01-02:

#

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

review: Needs Fixing (continuous-integration)

Michael Zanetti (mzanetti) wrote on 2017-01-04:

#

tested this in the appdrawer-improvements branch as a prereq. works fine.

code looks good

test seems flaky in CI tho...

review: Needs Fixing

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-01-04:

#

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

review: Needs Fixing (continuous-integration)

Lukáš Tinkl (lukas-kde) wrote on 2017-01-04:

#

> tested this in the appdrawer-improvements branch as a prereq. works fine.
>
> code looks good
>
> test seems flaky in CI tho...

Meh, the respective test is stable locally, even when running with "stress"

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-01-04:

#

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-01-09:

#

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

review: Needs Fixing (continuous-integration)

Lukáš Tinkl (lukas-kde) wrote on 2017-01-09:

#

I think the CI looks good now, the failure seems an unrelated flaky test.

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-01-09:

#

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

review: Needs Fixing (continuous-integration)

Michael Zanetti (mzanetti) wrote on 2017-01-10:

#

I've ran it again, and again the same one failed... But it seems this one is flaky on other branches too from time to time... Not blocking on this failure then.

review: Approve

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-01-10:

#

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

review: Approve (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-01-17:

#

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-01-17:

#

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

review: Approve (continuous-integration)

1	=== modified file 'qml/Launcher/Drawer.qml'
2	--- qml/Launcher/Drawer.qml 2016-11-28 10:17:22 +0000
3	+++ qml/Launcher/Drawer.qml 2017-01-16 10:52:54 +0000
4	@@ -43,6 +43,14 @@
5	searchField.focus = true;
6	}
7
8	+ Keys.onPressed: {
9	+ if (event.text.trim() !== "") {
10	+ focusInput();
11	+ searchField.text = event.text;
12	+ event.accepted = true;
13	+ }
14	+ }
15	+
16	Settings {
17	property alias selectedTab: sections.selectedIndex
18	}
19	@@ -76,6 +84,7 @@
20
21	TextField {
22	id: searchField
23	+ objectName: "searchField"
24	anchors { left: parent.left; top: parent.top; right: parent.right; margins: units.gu(1) }
25	placeholderText: i18n.tr("Search…")
26	focus: true
27
28	=== modified file 'qml/Launcher/Launcher.qml'
29	--- qml/Launcher/Launcher.qml 2016-12-07 13:47:15 +0000
30	+++ qml/Launcher/Launcher.qml 2017-01-16 10:52:54 +0000
31	@@ -74,7 +74,7 @@
32	} else {
33	superPressTimer.stop();
34	superLongPressTimer.stop();
35	- launcher.switchToNextState("");
36	+ switchToNextState("");
37	panel.shortcutHintsShown = false;
38	}
39	}
40	@@ -470,6 +470,8 @@
41	onPassed: {
42	if (root.drawerEnabled) {
43	root.switchToNextState("drawer");
44	+ root.focus = true;
45	+ drawer.focus = true;
46	}
47	}
48
49	@@ -547,6 +549,7 @@
50	if (root.drawerEnabled && distance > panel.width * 3 && dragDirection() !== "left") {
51	root.switchToNextState("drawer");
52	root.focus = true;
53	+ drawer.focus = true;
54	} else {
55	root.switchToNextState("visible");
56	}
57
58	=== modified file 'tests/mocks/Unity/Launcher/MockAppDrawerModel.cpp'
59	--- tests/mocks/Unity/Launcher/MockAppDrawerModel.cpp 2016-12-23 11:04:53 +0000
60	+++ tests/mocks/Unity/Launcher/MockAppDrawerModel.cpp 2017-01-16 10:52:54 +0000
61	@@ -48,7 +48,6 @@
62	m_list.append(item);
63	item = new MockLauncherItem("libreoffice", "/usr/share/applications/libreoffice.desktop","Libre Office", "libreoffice", this);
64	m_list.append(item);
65	- qDebug() << "mock model created";
66
67	qsrand(QDateTime::currentMSecsSinceEpoch() / 1000);
68	}
69
70	=== modified file 'tests/qmltests/Launcher/tst_Drawer.qml'
71	--- tests/qmltests/Launcher/tst_Drawer.qml 2016-11-30 18:08:16 +0000
72	+++ tests/qmltests/Launcher/tst_Drawer.qml 2017-01-16 10:52:54 +0000
73	@@ -26,6 +26,7 @@
74	StyledItem {
75	id: root
76	theme.name: "Ubuntu.Components.Themes.SuruDark"
77	+ focus: true
78
79	width: units.gu(140)
80	height: units.gu(70)
81	@@ -108,6 +109,7 @@
82	tryCompareFunction( function(){ return drawer.x === 0; }, true );
83	tryCompare(launcher, "state", "drawer");
84	tryCompare(launcher, "drawerShown", true);
85	+ return drawer;
86	}
87
88	function revealByEdgePush() {
89	@@ -168,11 +170,9 @@
90	function test_hideByDraggingDrawer(data) {
91	launcher.lockedVisible = !data.autohide;
92
93	- dragDrawerIntoView();
94	+ var drawer = dragDrawerIntoView();
95	waitForRendering(launcher);
96
97	- var drawer = findChild(launcher, "drawer");
98	-
99	mouseFlick(root, drawer.width - units.gu(1), drawer.height / 2, units.gu(2), drawer.height / 2, true, true);
100
101	tryCompare(drawer.anchors, "rightMargin", 0);
102	@@ -181,9 +181,7 @@
103	}
104
105	function test_hideByClickingOutside() {
106	- dragDrawerIntoView();
107	-
108	- var drawer = findChild(launcher, "drawer");
109	+ var drawer = dragDrawerIntoView();
110
111	mouseClick(root, drawer.width + units.gu(1), root.height / 2);
112
113	@@ -240,6 +238,8 @@
114	keyClick(Qt.Key_Enter);
115
116	compare(launcher.lastSelectedApplication, "camera-app");
117	+ waitForRendering(launcher);
118	+ tryCompare(launcher, "drawerShown", false);
119	}
120
121	function test_dragDirectionOnLeftEdgeDrag_data() {
122	@@ -260,5 +260,17 @@
123
124	tryCompare(launcher, "state", data.endState)
125	}
126	+
127	+ function test_searchDirectly() {
128	+ var drawer = dragDrawerIntoView();
129	+ waitForRendering(drawer);
130	+ waitUntilTransitionsEnd(drawer);
131	+ tryCompare(drawer, "focus", true);
132	+
133	+ var searchField = findChild(drawer, "searchField");
134	+ tryCompareFunction(function() { return !!searchField }, true);
135	+ typeString("cam");
136	+ tryCompareFunction(function() { return searchField.displayText }, "cam");
137	+ }
138	}
139	}

Unity 8

Merge lp:~lukas-kde/unity8/appdrawer-direct-search into lp:unity8

Commit Message

Description of the Change

Preview Diff

Subscribers