Merge lp://qastaging/~charlesk/indicator-datetime/lp-1560188-remove-calendar-from-phone-profile into lp://qastaging/indicator-datetime/15.10

Proposed by Charles Kerr
Status: Merged
Approved by: Xavi Garcia
Approved revision: 436
Merged at revision: 435
Proposed branch: lp://qastaging/~charlesk/indicator-datetime/lp-1560188-remove-calendar-from-phone-profile
Merge into: lp://qastaging/indicator-datetime/15.10
Diff against target: 83 lines (+8/-8)
3 files modified
src/menu.cpp (+2/-2)
tests/test-formatter.cpp (+4/-4)
tests/test-menus.cpp (+2/-2)
To merge this branch: bzr merge lp://qastaging/~charlesk/indicator-datetime/lp-1560188-remove-calendar-from-phone-profile
Reviewer Review Type Date Requested Status
Xavi Garcia Approve
Review via email: mp+289847@code.qastaging.launchpad.net

Commit message

Remove the calendar from the phone profile.

Description of the change

Revert r426 & r427 to remove the calendar from the phone profile.

The u8 calendar widget is causing problems in rc-proposed, so the calendar is being removed from the phone profile until this is resolved.

Steps to reproduce the issue, as described by Toykeeper in bug #1560188:
1. Wipe (or freshly flash) rc-proposed on a krillin or mako
2. Log in, configure time zone
3. Tilt the phone to make the screen rotate
At this point, the UI stopped responding and 'top' showed 100% CPU being used by unity8.

To post a comment you must log in.
436. By Charles Kerr

temporarily disable the formatter tests. This is a test harness error that doesn't need to block work on 1560188

Revision history for this message
Xavi Garcia (xavi-garcia-mena) wrote :

Looks good to me!

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