Ubuntu Clock App

Merge lp://staging/~nik90/ubuntu-clock-app/sync-bottomedge-sep08 into lp://staging/ubuntu-clock-app

sync-bottomedge-sep08
Merge into trunk

Proposed by Nekhelesh Ramananthan on 2014-09-30

Status:

Merged

Approved by:

Nekhelesh Ramananthan on 2014-10-09

Approved revision:

104

Merged at revision:

131

Proposed branch:

lp://staging/~nik90/ubuntu-clock-app/sync-bottomedge-sep08

Merge into:

lp://staging/ubuntu-clock-app

Diff against target:

535 lines (+188/-158)

7 files modified

app/clock/ClockPage.qml (+8/-1)
app/components/Clock.qml (+1/-0)
app/ubuntu-clock-app.qml (+0/-1)
app/upstreamcomponents/PageWithBottomEdge.qml (+164/-155)
debian/changelog (+12/-0)
manifest.json.in (+1/-1)
tests/autopilot/ubuntu_clock_app/emulators.py (+2/-0)

To merge this branch:

bzr merge lp://staging/~nik90/ubuntu-clock-app/sync-bottomedge-sep08

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Nekhelesh Ramananthan	testing		Approve on 2014-10-09
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2014-10-09
Renato Araujo Oliveira Filho		2014-09-30	Pending
Review via email: mp+236604@code.staging.launchpad.net

Commit message

Sync PageWithBottomEdge.qml with upstream addressbook changes with regards to bug 1357945.

Description of the change

Sync PageWithBottomEdge.qml with upstream addressbook changes with regards to bug 1357945.

Revision history for this message

Nekhelesh Ramananthan (nik90) wrote on 2014-09-30:

I notice 2 issues with this MP,

1. The bottom edge hint does not show automatically after opening the clock app.

2. The bottom edge hint does not hide when interacting with the content (scrolling, pressing button). This is also noticed in the upstream addressbook app as well.

3. When user stops interacting, it does not reappear after 5 seconds (also noticeable in upstream implementation).

review: Needs Fixing

Revision history for this message

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote on 2014-09-30:

FAILED: Continuous integration, rev:93
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/506/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/623
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/623/artifact/work/output/*zip*/output.zip
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/153/console

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

review: Needs Fixing (continuous-integration)

lp://staging/~nik90/ubuntu-clock-app/sync-bottomedge-sep08 updated on 2014-09-30

94. By Nekhelesh Ramananthan on 2014-09-30: Hide focus when flicking or interacting with clock page contents
95. By Nekhelesh Ramananthan on 2014-09-30: Synced with lp:~renatofilho/address-book-app/fix-1375513

Revision history for this message

Nekhelesh Ramananthan (nik90) wrote on 2014-09-30:

> I notice 2 issues with this MP,
>
> 1. The bottom edge hint does not show automatically after opening the clock
> app.
>

Still not fixed. Debugging atm.

> 2. The bottom edge hint does not hide when interacting with the content
> (scrolling, pressing button). This is also noticed in the upstream addressbook
> app as well.
>

Fixed in latest rev.

> 3. When user stops interacting, it does not reappear after 5 seconds (also
> noticeable in upstream implementation).

Renato mentioned that he agreed with the designers to not implement that, since it will be very complex to do and they are happy with the current implementation

Revision history for this message

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote on 2014-09-30:

FAILED: Continuous integration, rev:95
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/507/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/625
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/625/artifact/work/output/*zip*/output.zip
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/154/console

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

review: Needs Fixing (continuous-integration)

lp://staging/~nik90/ubuntu-clock-app/sync-bottomedge-sep08 updated on 2014-09-30

96. By Nekhelesh Ramananthan on 2014-09-30: Fixed AP test and also solved bottom edge hint not getting active focus at clock app start using a hack

Revision history for this message

Nekhelesh Ramananthan (nik90) wrote on 2014-09-30:

All issues resolved (issue 1 solved with a hack). Let's see if we can resolve it properly.

Revision history for this message

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote on 2014-09-30:

FAILED: Continuous integration, rev:96
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/508/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/631
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/631/artifact/work/output/*zip*/output.zip
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/155/console

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

review: Needs Fixing (continuous-integration)

lp://staging/~nik90/ubuntu-clock-app/sync-bottomedge-sep08 updated on 2014-09-30

97. By Nekhelesh Ramananthan on 2014-09-30: Removed ugly hack which was added before

Revision history for this message

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote on 2014-09-30:

FAILED: Continuous integration, rev:97
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/509/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/632
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/632/artifact/work/output/*zip*/output.zip
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/156/console

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

review: Needs Fixing (continuous-integration)

lp://staging/~nik90/ubuntu-clock-app/sync-bottomedge-sep08 updated on 2014-10-01

98. By Nekhelesh Ramananthan on 2014-10-01: Fixed AP test by waiting for bottom edge hint to be shown

Revision history for this message

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote on 2014-10-01:

FAILED: Continuous integration, rev:98
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/511/
Executed test runs:
None: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/158/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote on 2014-10-01:

FAILED: Continuous integration, rev:98
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/510/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/642
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/642/artifact/work/output/*zip*/output.zip
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/157/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Nekhelesh Ramananthan (nik90) wrote on 2014-10-02:

This has been design approved by Giorgio. Just need the AP tests to pass now before this can be merged!

Damn you Jenkins :P

lp://staging/~nik90/ubuntu-clock-app/sync-bottomedge-sep08 updated on 2014-10-02

99. By Nekhelesh Ramananthan on 2014-10-02: Added debug

Revision history for this message

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote on 2014-10-02:

FAILED: Continuous integration, rev:99
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/513/
Executed test runs:
None: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/160/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote on 2014-10-02:

FAILED: Continuous integration, rev:99
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/512/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/659
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/659/artifact/work/output/*zip*/output.zip
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/159/console

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

review: Needs Fixing (continuous-integration)

lp://staging/~nik90/ubuntu-clock-app/sync-bottomedge-sep08 updated on 2014-10-02

100. By Nekhelesh Ramananthan on 2014-10-02: Disabled alarms tests

Revision history for this message

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote on 2014-10-02:

FAILED: Continuous integration, rev:100
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/514/
Executed test runs:
FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/662/console
FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/161/console

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

review: Needs Fixing (continuous-integration)

lp://staging/~nik90/ubuntu-clock-app/sync-bottomedge-sep08 updated on 2014-10-02

101. By Nekhelesh Ramananthan on 2014-10-02: Reverted disabling tests

Revision history for this message

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote on 2014-10-02:

FAILED: Continuous integration, rev:101
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/515/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/663
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/663/artifact/work/output/*zip*/output.zip
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/162/console

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

review: Needs Fixing (continuous-integration)

lp://staging/~nik90/ubuntu-clock-app/sync-bottomedge-sep08 updated on 2014-10-02

102. By Nekhelesh Ramananthan on 2014-10-02: Removed unnecessary function in bottom edge file

Revision history for this message

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote on 2014-10-02:

FAILED: Continuous integration, rev:102
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/516/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/665
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/665/artifact/work/output/*zip*/output.zip
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/163/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Nekhelesh Ramananthan (nik90) wrote on 2014-10-08:

#blocked on Jenkins. This requires a patch to the Jenkins environment since the xvfb package which is used to run the clock app tests takes input focus away from the clock app when it is launched. This is causing the AP tests to be pass. Francis and Nicholas have been informed. Once jenkins is fixed, we should be good to merge this branch.

review: Needs Fixing

lp://staging/~nik90/ubuntu-clock-app/sync-bottomedge-sep08 updated on 2014-10-09

103. By Nekhelesh Ramananthan on 2014-10-09: merged trunk lp:ubuntu-clock-app

Revision history for this message

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote on 2014-10-09:

FAILED: Continuous integration, rev:103
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/535/
Executed test runs:
UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/790
deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/790/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote on 2014-10-09:

PASSED: Continuous integration, rev:103
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/537/
Executed test runs:
SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/799
deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/799/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

Revision history for this message

Nekhelesh Ramananthan (nik90) wrote on 2014-10-09:

#unblocked

lp://staging/~nik90/ubuntu-clock-app/sync-bottomedge-sep08 updated on 2014-10-09

104. By Nekhelesh Ramananthan on 2014-10-09: Updated changelog and bumped version to 3.2

Revision history for this message

Nekhelesh Ramananthan (nik90) wrote on 2014-10-09:

This MP only syncs the bottom edge component with upstream code. So no code review necessary. It was tested by myself and Giorgio (designer) on N4 and Krillin and confirmed to be working as expected.

Approving.

review: Approve (testing)

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

to all changes:

Nekhelesh Ramananthan

Ubuntu Clock Developers