Unity

Merge lp://qastaging/~azzar1/unity/fix-1035860 into lp://qastaging/unity

  1. fix-1035860
  2. Merge into trunk
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
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_KEYS_VISIBLE from hover machine to hide machine.

Description of the change

== Problem ==
[regression] Launcher tooltip should not appear when keyboard overlay is shown.

== Fix ==
Move SHORTCUT_KEYS_VISIBLE from hover machine to hide machine.

== Test ==
* AP test for the bug 1035860.
* unit tests for LauncherHoverMachine.
* 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.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

LGTM

review: Approve
Revision history for this message
Thomi Richards (thomir-deactivatedaccount) :
review: Approve (quality)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/82/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/82/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/82/console

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/83/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/83/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/83/console

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/84/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/84/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/84/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Martin Mrazik (mrazik) wrote :

Jenkins failure -- re-approving.

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.