Merge lp:~pkunal-parmar/ubuntu-calendar-app/TimePickerHeight into lp:ubuntu-calendar-app

Proposed by Kunal Parmar
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 πŸ¦„
Approved revision: 582
Merged at revision: 586
Proposed branch: lp:~pkunal-parmar/ubuntu-calendar-app/TimePickerHeight
Merge into: lp:ubuntu-calendar-app
Diff against target: 48 lines (+19/-1)
2 files modified
NewEventEntryField.qml (+1/-1)
tests/autopilot/calendar_app/__init__.py (+18/-0)
To merge this branch: bzr merge lp:~pkunal-parmar/ubuntu-calendar-app/TimePickerHeight
Reviewer Review Type Date Requested Status
Alan Pope 🍺🐧🐱 πŸ¦„ (community) Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+249922@code.launchpad.net

Commit message

Resolving Bug #1419671 ,

Increasing height of Time and Date picker's height

Description of the change

Resolving Bug #1419671 ,

Increasing height of Time and Date picker's height

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
581. By Kunal Parmar

dummy

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Kunal Parmar (pkunal-parmar) wrote :

> FAILED: Continuous integration, rev:581
> http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1075/
> Executed test runs:
> UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-vivid/1101
> deb: http://91.189.93.70:8080/job/generic-mediumtests-
> vivid/1101/artifact/work/output/*zip*/output.zip
> SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-
> amd64-ci/72
>
> Click here to trigger a rebuild:
> http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1075/rebuild

Apparently, its failing because after increasing the height of TimePicker field, Autopilot is not able to click on Add cotact button. We need to modify the AP to fix this.

582. By Kunal Parmar

AP fix

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Alan Pope 🍺🐧🐱 πŸ¦„ (popey) wrote :

Looks good to me!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NewEventEntryField.qml'
2--- NewEventEntryField.qml 2014-09-15 16:07:15 +0000
3+++ NewEventEntryField.qml 2015-02-19 13:24:49 +0000
4@@ -24,7 +24,7 @@
5
6 property bool highlighted: false
7
8- height: units.gu(3)
9+ height: units.gu(6)
10
11 verticalAlignment: Text.AlignVCenter
12 color: highlighted ? "#2C001E" : Theme.palette.normal.baseText
13
14=== modified file 'tests/autopilot/calendar_app/__init__.py'
15--- tests/autopilot/calendar_app/__init__.py 2015-02-17 05:41:46 +0000
16+++ tests/autopilot/calendar_app/__init__.py 2015-02-19 13:24:49 +0000
17@@ -232,6 +232,23 @@
18
19 self.pointing_device.drag(x_start, y_line, x_stop, y_line)
20
21+ def swipe_view_vertical(self, direction, view, y_pad=0.08):
22+ """Swipe the given view to up or down.
23+
24+ Args:
25+ direction:
26+ """
27+
28+ start = (-direction * y_pad) % 1
29+ stop = (direction * y_pad) % 1
30+
31+ x_line = view.globalRect[0] + view.globalRect[2] / 2
32+ y_start = view.globalRect[1] + view.globalRect[3] * start
33+ y_stop = view.globalRect[1] + view.globalRect[3] * stop
34+
35+ self.pointing_device.drag(x_line, y_start, x_line, y_stop)
36+ sleep(1)
37+
38 def to_local_date(self, date):
39 utc = date.replace(tzinfo=tz.tzutc())
40 local = utc.astimezone(tz.tzlocal())
41@@ -616,6 +633,7 @@
42 def _fill_guests(self, guests):
43 guests_btn = self.select_single('Button', objectName='addGuestButton')
44 main_view = self.get_root_instance().select_single(MainView)
45+ main_view.swipe_view_vertical(1, self)
46
47 for guest in guests:
48 self.pointing_device.click_object(guests_btn)

Subscribers

People subscribed via source and target branches

to status/vote changes: