Merge lp://staging/~paolorotolo/ubuntu-clock-app/fix-for-1284564 into lp://staging/ubuntu-clock-app/saucy

Proposed by Paolo Rotolo
Status: Merged
Approved by: Nekhelesh Ramananthan
Approved revision: 378
Merged at revision: 395
Proposed branch: lp://staging/~paolorotolo/ubuntu-clock-app/fix-for-1284564
Merge into: lp://staging/ubuntu-clock-app/saucy
Diff against target: 160 lines (+65/-53)
3 files modified
alarm/AlarmList.qml (+50/-45)
tests/autopilot/ubuntu_clock_app/emulators.py (+7/-4)
tests/autopilot/ubuntu_clock_app/tests/test_alarm.py (+8/-4)
To merge this branch: bzr merge lp://staging/~paolorotolo/ubuntu-clock-app/fix-for-1284564
Reviewer Review Type Date Requested Status
Nekhelesh Ramananthan Approve
Paolo Rotolo (community) Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+210903@code.staging.launchpad.net

Commit message

Fixed LP: #1284564.

Description of the change

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:375
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~paolorotolo/ubuntu-clock-app/fix-for-1284564/+merge/210903/+edit-commit-message

http://91.189.93.70:8080/job/ubuntu-clock-app-ci/337/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1731
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/337
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/337
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/255

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/337/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

Lucas has provided a new design for this bug. The visual mockup can be found at https://lh5.googleusercontent.com/-p9j5DOu3mAw/UzMa9MajJkI/AAAAAAAAWTM/dUeHGruHVo4/w838-h590-no/rectd11975.png . Can you implement the mockup please?

In the mockup, the alarm status is shown on the right. If the alarm is enabled it is green, if not it is Qt.rgba(0,0,0,0.4). This is *not* a button. It only shows the alarm status.

The color hex codes are shown in https://lh3.googleusercontent.com/-rpLRjA2OKRo/UzMaGbfOrxI/AAAAAAAAWSM/CCf8137RyKA/s512/COLORES.png . Please choose the first green color shown in this image.

Is this something that can be implemented in the coming 3-4 days? Let me know if you can't and I will implement it otherwise.

review: Needs Fixing
376. By Paolo Rotolo

Deleted Switch and added new Button that change according to alarm status (active/inactive) in AlarmList.

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
377. By Paolo Rotolo

Added UbuntuShape.

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
Nekhelesh Ramananthan (nik90) wrote :

Paolo I proposed a MP https://code.launchpad.net/~nik90/ubuntu-clock-app/fix-paolo-ap/+merge/215834 that you need to merge into this MP. It fixes the AP test failures that you get in this MP.

To merge it, you will need to run bzr merge lp:~nik90/ubuntu-clock-app/fix-paolo-ap inside your code folder. I hope you understand. If not send me an email or irc ping.

378. By Paolo Rotolo

Merged nik's branck.

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
Paolo Rotolo (paolorotolo) wrote :

Well, thanks Jenkins! \o/

review: Approve
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

Nice work.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches