← Back to branch summary

~sil2100/unity/ubuntu_quantal_fixes

« back to all changes in this revision

Viewing changes to tests/autopilot/unity/emulators/launcher.py

  • Committer: Daniel van Vugt
  • Date: 2012-06-19 03:34:06 UTC
  • mfrom: (55.1863.73 unity)
  • mto: (55.1863.122 unity)
  • mto: This revision was merged to the branch mainline in revision 729.
  • Revision ID: daniel.van.vugt@canonical.com-20120619033406-37aqyx2lmp1nzfuk
Rebase on latest upstream lp:unity

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/autopilot/unity/emulators/launcher.py
93
93
        self.keybinding(keybinding)
94
94
 
95
95
    def _perform_switcher_exit_binding(self, keybinding):
96
 
        self._perform_switcher_binding(keybinding)
97
 
        # if our exit binding was something besides just releasing, we need to release
 
96
        # If we're doing a normal activation, all we need to do is release the
 
97
        # keybinding. Otherwise, perform the keybinding specified *then* release
 
98
        # the switcher keybinding.
98
99
        if keybinding != "launcher/switcher":
99
 
            self.keybinding_release("launcher/switcher")
 
100
            self._perform_switcher_binding(keybinding)
 
101
        self.keybinding_release("launcher/switcher")
100
102
        self.in_switcher_mode = False
101
103
 
102
104
    def _get_controller(self):