From b6a191efc0e583ddcc2adcf5171d304f82af22b3 Mon Sep 17 00:00:00 2001
From: Wonsik Jung <sidein@samsung.com>
Date: Mon, 1 Jul 2019 14:25:46 +0900
Subject: [PATCH] Revert "[Tizen] Connect KeyEventGeneratedSignal for Get
 KeyEvent"

This reverts commit 9adb88d8b49aff3bd466b377b75c242a497c8737.
---
 .../dali-toolkit-test-utils/toolkit-window.cpp          |  6 ------
 .../dali-toolkit-test-utils/toolkit-window.h            |  2 --
 .../focus-manager/keyinput-focus-manager-impl.cpp       | 17 +----------------
 .../focus-manager/keyinput-focus-manager-impl.h         |  7 -------
 4 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.cpp
index d9e9cd8..05c4836 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.cpp
@@ -20,7 +20,6 @@
 #include <dali/public-api/actors/layer.h>
 #include <dali/public-api/common/stage.h>
 #include <dali/public-api/object/base-object.h>
-#include <dali/devel-api/common/stage-devel.h>
 
 // INTERNAL INCLUDES
 #include "toolkit-window.h"
@@ -108,11 +107,6 @@ KeyEventSignalType& KeyEventSignal( Window window )
   return Dali::Stage::GetCurrent().KeyEventSignal();
 }
 
-KeyEventGeneratedSignalType& KeyEventGeneratedSignal( Window window )
-{
-  return DevelStage::KeyEventGeneratedSignal( Dali::Stage::GetCurrent() );
-}
-
 TouchSignalType& TouchSignal( Window window )
 {
   return Dali::Stage::GetCurrent().TouchSignal();
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.h
index 37361dd..4c95ad7 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.h
@@ -62,12 +62,10 @@ namespace DevelWindow
 {
 
 typedef Signal< void (const KeyEvent&) > KeyEventSignalType;
-typedef Signal< bool (const KeyEvent&) > KeyEventGeneratedSignalType;
 typedef Signal< void (const TouchData&) > TouchSignalType;
 
 Dali::Window Get( Actor actor );
 KeyEventSignalType& KeyEventSignal( Dali::Window window );
-KeyEventGeneratedSignalType& KeyEventGeneratedSignal( Dali::Window window );
 TouchSignalType& TouchSignal( Dali::Window window );
 
 }
diff --git a/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp b/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp
index 71bc352..f188281 100644
--- a/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp
+++ b/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.cpp
@@ -23,8 +23,6 @@
 #include <dali/public-api/actors/layer.h>
 #include <dali/public-api/common/stage.h>
 #include <dali/devel-api/common/stage-devel.h>
-#include <dali/devel-api/adaptor-framework/window-devel.h>
-#include <dali/integration-api/adaptors/adaptor.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
@@ -52,26 +50,13 @@ KeyInputFocusManager::KeyInputFocusManager()
 : mSlotDelegate( this ),
   mCurrentFocusControl()
 {
-  // Retrieve all the existing widnows
-  Dali::WindowContainer windows = Adaptor::Get().GetWindows();
-  for ( auto iter = windows.begin(); iter != windows.end(); ++iter )
-  {
-    DevelWindow::KeyEventGeneratedSignal( *iter ).Connect( mSlotDelegate, &KeyInputFocusManager::OnKeyEvent);
-  }
-
-  // Get notified when any new window is created afterwards
-  Adaptor::Get().WindowCreatedSignal().Connect( mSlotDelegate, &KeyInputFocusManager::OnWindowCreated);
+  DevelStage::KeyEventGeneratedSignal( Stage::GetCurrent() ).Connect(mSlotDelegate, &KeyInputFocusManager::OnKeyEvent);
 }
 
 KeyInputFocusManager::~KeyInputFocusManager()
 {
 }
 
-void KeyInputFocusManager::OnWindowCreated( Dali::Window& window )
-{
-  DevelWindow::KeyEventGeneratedSignal( window ).Connect( mSlotDelegate, &KeyInputFocusManager::OnKeyEvent);
-}
-
 void KeyInputFocusManager::SetFocus( Toolkit::Control control )
 {
   if( !control )
diff --git a/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.h b/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.h
index 0f066c5..f7886c2 100644
--- a/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.h
+++ b/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.h
@@ -30,8 +30,6 @@
 namespace Dali
 {
 
-class Window;
-
 namespace Toolkit
 {
 
@@ -92,11 +90,6 @@ protected:
   virtual ~KeyInputFocusManager();
 
 private:
-  /**
-   * This will be called when a new window is created
-   * @param window The new window
-   */
-  void OnWindowCreated( Dali::Window& window );
 
   /**
    * Callback for the key event when no actor in the stage has gained the key input focus
-- 
2.7.4