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
=== modified file 'NewEventEntryField.qml'
--- NewEventEntryField.qml 2014-09-15 16:07:15 +0000
+++ NewEventEntryField.qml 2015-02-19 13:24:49 +0000
@@ -24,7 +24,7 @@
2424
25 property bool highlighted: false25 property bool highlighted: false
2626
27 height: units.gu(3)27 height: units.gu(6)
2828
29 verticalAlignment: Text.AlignVCenter29 verticalAlignment: Text.AlignVCenter
30 color: highlighted ? "#2C001E" : Theme.palette.normal.baseText30 color: highlighted ? "#2C001E" : Theme.palette.normal.baseText
3131
=== modified file 'tests/autopilot/calendar_app/__init__.py'
--- tests/autopilot/calendar_app/__init__.py 2015-02-17 05:41:46 +0000
+++ tests/autopilot/calendar_app/__init__.py 2015-02-19 13:24:49 +0000
@@ -232,6 +232,23 @@
232232
233 self.pointing_device.drag(x_start, y_line, x_stop, y_line)233 self.pointing_device.drag(x_start, y_line, x_stop, y_line)
234234
235 def swipe_view_vertical(self, direction, view, y_pad=0.08):
236 """Swipe the given view to up or down.
237
238 Args:
239 direction:
240 """
241
242 start = (-direction * y_pad) % 1
243 stop = (direction * y_pad) % 1
244
245 x_line = view.globalRect[0] + view.globalRect[2] / 2
246 y_start = view.globalRect[1] + view.globalRect[3] * start
247 y_stop = view.globalRect[1] + view.globalRect[3] * stop
248
249 self.pointing_device.drag(x_line, y_start, x_line, y_stop)
250 sleep(1)
251
235 def to_local_date(self, date):252 def to_local_date(self, date):
236 utc = date.replace(tzinfo=tz.tzutc())253 utc = date.replace(tzinfo=tz.tzutc())
237 local = utc.astimezone(tz.tzlocal())254 local = utc.astimezone(tz.tzlocal())
@@ -616,6 +633,7 @@
616 def _fill_guests(self, guests):633 def _fill_guests(self, guests):
617 guests_btn = self.select_single('Button', objectName='addGuestButton')634 guests_btn = self.select_single('Button', objectName='addGuestButton')
618 main_view = self.get_root_instance().select_single(MainView)635 main_view = self.get_root_instance().select_single(MainView)
636 main_view.swipe_view_vertical(1, self)
619637
620 for guest in guests:638 for guest in guests:
621 self.pointing_device.click_object(guests_btn)639 self.pointing_device.click_object(guests_btn)

Subscribers

People subscribed via source and target branches

to status/vote changes: