Merge lp://qastaging/~thomir-deactivatedaccount/unity/sc-integration-phase2 into lp://qastaging/unity
Status: | Merged |
---|---|
Approved by: | Tim Penhey |
Approved revision: | no longer in the source branch. |
Merged at revision: | 2183 |
Proposed branch: | lp://qastaging/~thomir-deactivatedaccount/unity/sc-integration-phase2 |
Merge into: | lp://qastaging/unity |
Diff against target: |
554 lines (+225/-42) 10 files modified
plugins/unityshell/src/BamfLauncherIcon.h (+1/-1) plugins/unityshell/src/Launcher.cpp (+7/-1) plugins/unityshell/src/Launcher.h (+7/-3) plugins/unityshell/src/LauncherController.cpp (+32/-20) plugins/unityshell/src/SoftwareCenterLauncherIcon.cpp (+93/-5) plugins/unityshell/src/SoftwareCenterLauncherIcon.h (+23/-3) tests/autopilot/autopilot/emulators/X11.py (+8/-6) tests/autopilot/autopilot/emulators/unity/icons.py (+3/-0) tests/autopilot/autopilot/emulators/unity/launcher.py (+14/-1) tests/autopilot/autopilot/tests/test_launcher.py (+37/-2) |
To merge this branch: | bzr merge lp://qastaging/~thomir-deactivatedaccount/unity/sc-integration-phase2 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tim Penhey (community) | Approve | ||
Marco Trevisan (Treviño) | Needs Fixing | ||
Thomi Richards | Pending | ||
Alex Launi | Pending | ||
Matthew Paul Thomas | design | Pending | |
Review via email: mp+97784@code.qastaging.launchpad.net |
This proposal supersedes a proposal from 2012-03-04.
Commit message
Add animation of icon moving to the launcher, and the wiggle when installation is complete.
Description of the change
This is the second phase of Software Center integration with the Unity launcher. The first phase included progress bars on the icon, as well as a "Waiting to install" tooltip. The second phase includes an icon moving animation from Software Center to the launcher, and also icon Activate() changes. The software center design spec for the whole feature is:
https:/
The first phase landed around Unity 5.2.0, but got broken right before the release of 5.2.0 (bug #932280). The fix to it lies in this branch: https:/
Note that this branch contains the code from the above merge request too, so if someone were to merge this branch into lp:unity, there would be no need to merge lp:~bilalakhtar/unity/fix-sc-launcher-integration. The reason why I've made two different branches is because I'd like to give the lp:~bilalakhtar/unity/fix-sc-launcher-integration a higher priority (5.6.0) while this could get in to either 5.6.0 (unlikely) or 5.8.0.
The implementation is very stable, with unit tests and all.
Here's a YouTube video of this branch in action:
http://
Bug request for the whole issue was bug #761851, but it got marked Fix Released after phase 1. Not sure if I should mark it Triaged again, or not.