Merge lp://qastaging/~azzar1/unity/fix-1035860 into lp://qastaging/unity
Proposed by
Andrea Azzarone
Status: | Merged |
---|---|
Approved by: | Martin Mrazik |
Approved revision: | no longer in the source branch. |
Merged at revision: | 2874 |
Proposed branch: | lp://qastaging/~azzar1/unity/fix-1035860 |
Merge into: | lp://qastaging/unity |
Diff against target: |
387 lines (+219/-23) 11 files modified
launcher/Decaymulator.h (+1/-1) launcher/Launcher.cpp (+4/-4) launcher/LauncherHideMachine.cpp (+5/-3) launcher/LauncherHideMachine.h (+2/-2) launcher/LauncherHoverMachine.cpp (+5/-7) launcher/LauncherHoverMachine.h (+4/-5) tests/CMakeLists.txt (+2/-0) tests/autopilot/unity/tests/launcher/test_shortcut.py (+6/-0) tests/test_launcher.cpp (+0/-1) tests/test_launcher_hide_machine.cpp (+75/-0) tests/test_launcher_hover_machine.cpp (+115/-0) |
To merge this branch: | bzr merge lp://qastaging/~azzar1/unity/fix-1035860 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Thomi Richards (community) | quality | Approve | |
Marco Trevisan (Treviño) | Approve | ||
Review via email: mp+129949@code.qastaging.launchpad.net |
Commit message
Move SHORTCUT_
Description of the change
== Problem ==
[regression] Launcher tooltip should not appear when keyboard overlay is shown.
== Fix ==
Move SHORTCUT_
== Test ==
* AP test for the bug 1035860.
* unit tests for LauncherHoverMa
* unit tests for LauncherHideMachine (just for the hide mode NEVER, will complete the job in another branch later ... :)
To post a comment you must log in.
LGTM