Merge lp:~azzar1/unity/lp-1321043 into lp:unity

[Andrea Azzarone]

Disable switcher gestures if screen is locked. Fixed a regression.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3810
http://jenkins.qa.ubuntu.com/job/unity-ci/929/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/16

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/929/rebuild

review: Approve (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

Looks fine, thanks.

review: Approve

=== modified file 'plugins/unityshell/src/GesturalWindowSwitcher.cpp'
--- plugins/unityshell/src/GesturalWindowSwitcher.cpp	2013-07-01 17:07:40 +0000
+++ plugins/unityshell/src/GesturalWindowSwitcher.cpp	2014-05-20 11:50:40 +0000
@@ -115,6 +115,9 @@
 
 GestureDeliveryRequest GesturalWindowSwitcherPrivate::GestureEvent(nux::GestureEvent const& event)
 {
+  if (unity_screen->lockscreen_controller()->IsLocked())
+    return GestureDeliveryRequest::NONE;
+
   switch (state)
   {
     case State::WaitingCompoundGesture:
 
=== modified file 'plugins/unityshell/src/GesturalWindowSwitcher.h'
--- plugins/unityshell/src/GesturalWindowSwitcher.h	2013-01-24 16:32:35 +0000
+++ plugins/unityshell/src/GesturalWindowSwitcher.h	2014-05-20 11:50:40 +0000
@@ -77,6 +77,7 @@
   private:
     GesturalWindowSwitcherPrivate* p;
 };
+
 typedef std::shared_ptr<GesturalWindowSwitcher> ShPtGesturalWindowSwitcher;
 
 } // namespace unity
 
=== added file 'tests/test-gestures/LockScreenControllerMock.h'
--- tests/test-gestures/LockScreenControllerMock.h	1970-01-01 00:00:00 +0000
+++ tests/test-gestures/LockScreenControllerMock.h	2014-05-20 11:50:40 +0000
@@ -0,0 +1,43 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Andrea Azzarone <[e-mail]>
+ */
+
+#ifndef LOCK_SCREEN_CONTROLLER_MOCK_H
+#define LOCK_SCREEN_CONTROLLER_MOCK_H
+
+#include <memory>
+
+namespace unity
+{
+namespace lockscreen
+{
+
+class ControllerMock
+{
+public:
+  typedef std::shared_ptr<ControllerMock> Ptr;
+
+  bool IsLocked() {
+    return false;
+  }
+};
+
+}
+}
+
+#endif
 \ No newline at end of file
 
=== modified file 'tests/test-gestures/sed_script_switcher'
--- tests/test-gestures/sed_script_switcher	2013-01-24 16:32:35 +0000
+++ tests/test-gestures/sed_script_switcher	2014-05-20 11:50:40 +0000
@@ -19,8 +19,10 @@
 s|\<Nux/Nux\.h\>|NuxMock.h|g
 s|\<CompTimer\>|CompTimerMock|g
 s|\<LauncherController\>|LauncherControllerMock|g
+s|\<LockScreenController\>|LockControllerMock|g
 s|\<SwitcherController\>|SwitcherControllerMock|g
 s|\<switcher\:\:Controller\>|switcher\:\:ControllerMock|g
+s|\<lockscreen\:\:Controller\>|lockscreen\:\:ControllerMock|g
 s|\<launcher\:\:Controller\>|launcher\:\:ControllerMock|g
 /SwitcherView\.h/d
 s|\<SwitcherView\>|SwitcherViewMock|g
 
=== modified file 'tests/test-gestures/unityshell_mock.h'
--- tests/test-gestures/unityshell_mock.h	2012-08-14 13:06:03 +0000
+++ tests/test-gestures/unityshell_mock.h	2014-05-20 11:50:40 +0000
@@ -6,7 +6,7 @@
 #include <NuxMock.h>
 
 #include "SwitcherControllerMock.h"
-
+#include "LockScreenControllerMock.h"
 
 namespace unity
 {
@@ -29,6 +29,7 @@
   UnityScreenMock()
   {
     switcher_controller_ = std::make_shared<switcher::ControllerMock>();
+    lockscreen_controller_ = std::make_shared<lockscreen::ControllerMock>();
     Reset();
   }
 
@@ -59,7 +60,13 @@
     return switcher_controller_;
   }
 
+  lockscreen::ControllerMock::Ptr lockscreen_controller()
+  {
+    return lockscreen_controller_;
+  }
+
   switcher::ControllerMock::Ptr switcher_controller_;
+  lockscreen::ControllerMock::Ptr lockscreen_controller_;
   int SetUpAndShowSwitcher_count_;
 };