Merge lp:~nik90/ubuntu-clock-app/add-timer-placeholder-text into lp:ubuntu-clock-app/saucy

[Nekhelesh Ramananthan]

Added a placeholder text for the timer preset name instead of showing a blank field. Fixed autopilot test to use UITK TextField emulator.

Just proposing to see code diff. Do not merge.

[Leo Arias (elopio)]

Looks good to me.
Just, please update the copyright year on timer/PresetList.qml

review: Needs Fixing (code review)

[Nekhelesh Ramananthan (nik90)]

> Looks good to me.
> Just, please update the copyright year on timer/PresetList.qml

Actually every file in the clock app code base requires the copyright year to be updated for 2014. Do you mind if I do them all in one MP rather than this one? Also should I update it Copyright (C) 2013-2014 Canonical Ltd?

[Nekhelesh Ramananthan (nik90)]

> Also should I update it Copyright (C) 2013-2014 Canonical Ltd?

Never mind, I noticed that in your MP you did 2013, 2014. Will do this in another MP if you agree.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:317
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/~nik90/ubuntu-clock-app/add-timer-placeholder-text/+merge/204324/+edit-commit-message

http://91.189.93.70:8080/job/ubuntu-clock-app-ci/180/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/913
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/180
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/180
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/98

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

review: Needs Fixing (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

Here is the MP -> https://code.launchpad.net/~nik90/ubuntu-clock-app/update-copyright-year/+merge/204380 which updates all copyright years.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:318
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/187/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/924
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/187
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/187
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/105

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

review: Needs Fixing (continuous-integration)

[Leo Arias (elopio)]

Yes, it's ok, thanks for updating all of them.

It seems the TextField emulator has not been released yet. It's weird because it has been on trunk for almost 15 days. I'll ask on Monday when do they plan to have a new release.

Marking as approved, but the tests will not pass yet.

Thanks you.

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:321
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/222/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1219
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/222
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/222
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/140

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

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:321
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/240/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1319
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/240
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/240
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/158

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

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:322
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/242/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1321
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/242
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/242
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/160

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

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:322
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/245/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1328
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/245
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/245
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/163

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

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:322
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/261/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1398
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/261
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/261
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/179

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

review: Approve (continuous-integration)

[David Planella (dpm)]

10 + PropertyChanges { target: namePreset; text: "Timer #" + (listPreset.listCount + 1) }

Needs to be made translatable with i18n.tr() - is this something that we need for MWC?

review: Needs Fixing

[Nekhelesh Ramananthan (nik90)]

True not a priority for MWC. Postponing for next. Let's not take any chances.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:324
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/274/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1426
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/274
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/274
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/192

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

review: Approve (continuous-integration)

Unmerged revisions

324. By Nekhelesh Ramananthan on 2014-02-19

removed textfield emulator call since it is already in trunk

323. By Nekhelesh Ramananthan on 2014-02-19

merged trunk

=== modified file 'timer/TimerPage.qml'
--- timer/TimerPage.qml	2014-02-15 13:36:43 +0000
+++ timer/TimerPage.qml	2014-02-19 21:31:20 +0000
@@ -131,8 +131,7 @@
             PropertyChanges { target: analogTimer; enableMouseArea: false }
             PropertyChanges { target: listPreset; visible: false }
             PropertyChanges { target: namePreset; visible: true }
-            // TODO: Fix autopilot test first before enabling this change in another MP
-            //PropertyChanges { target: namePreset; text: "Timer #" + (listPreset.listCount + 1) }
+            PropertyChanges { target: namePreset; text: "Timer #" + (listPreset.listCount + 1) }
             PropertyChanges { target: addPresetToolbarButton; visible: false }
             PropertyChanges { target: editPresetToolbarButton; visible: true }
             PropertyChanges { target: cancelPresetToolbarButton; visible: true }