From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Wed, 23 Sep 2020 12:03:19 +0000 (+0000)
Subject: Merge "Remove unused enumeration types of ButtonAction" into devel/master
X-Git-Tag: dali_1.9.31~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6aa07bcd3edcdc6960b0ba9bc40e0982138dcc91;hp=048aa440fb1979ec2b6d25d4be758428881eed89;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

Merge "Remove unused enumeration types of ButtonAction" into devel/master
---

diff --git a/dali/internal/input/tizen-wayland/virtual-keyboard-impl-ecore-wl.cpp b/dali/internal/input/tizen-wayland/virtual-keyboard-impl-ecore-wl.cpp
index 82e2a95..9fd2dcc 100755
--- a/dali/internal/input/tizen-wayland/virtual-keyboard-impl-ecore-wl.cpp
+++ b/dali/internal/input/tizen-wayland/virtual-keyboard-impl-ecore-wl.cpp
@@ -53,12 +53,9 @@ Ecore_IMF_Input_Panel_Return_Key_Type buttonActionMapping(Dali::InputMethod::But
     case InputMethod::ButtonAction::JOIN:        return ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_JOIN;
     case InputMethod::ButtonAction::LOGIN:       return ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_LOGIN;
     case InputMethod::ButtonAction::NEXT:        return ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_NEXT;
-    case InputMethod::ButtonAction::PREVIOUS:    return ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_DEFAULT;
     case InputMethod::ButtonAction::SEARCH:      return ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_SEARCH;
     case InputMethod::ButtonAction::SEND:        return ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_SEND;
-    case InputMethod::ButtonAction::SIGNIN:      return ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_DEFAULT;
-    case InputMethod::ButtonAction::UNSPECIFIED: return ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_DEFAULT;
-    case InputMethod::ButtonAction::NONE:        return ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_DEFAULT;
+    case InputMethod::ButtonAction::SIGNIN:      return ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_SIGNIN;
     default:                                     return ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_DEFAULT;
   }
 }
diff --git a/dali/internal/input/ubuntu-x11/virtual-keyboard-impl-x.cpp b/dali/internal/input/ubuntu-x11/virtual-keyboard-impl-x.cpp
index a1a46f6..2aa062d 100755
--- a/dali/internal/input/ubuntu-x11/virtual-keyboard-impl-x.cpp
+++ b/dali/internal/input/ubuntu-x11/virtual-keyboard-impl-x.cpp
@@ -53,12 +53,9 @@ Ecore_IMF_Input_Panel_Return_Key_Type buttonActionMapping(Dali::InputMethod::But
     case InputMethod::ButtonAction::JOIN:        return ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_JOIN;
     case InputMethod::ButtonAction::LOGIN:       return ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_LOGIN;
     case InputMethod::ButtonAction::NEXT:        return ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_NEXT;
-    case InputMethod::ButtonAction::PREVIOUS:    return ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_DEFAULT;
     case InputMethod::ButtonAction::SEARCH:      return ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_SEARCH;
     case InputMethod::ButtonAction::SEND:        return ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_SEND;
-    case InputMethod::ButtonAction::SIGNIN:      return ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_DEFAULT;
-    case InputMethod::ButtonAction::UNSPECIFIED: return ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_DEFAULT;
-    case InputMethod::ButtonAction::NONE:        return ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_DEFAULT;
+    case InputMethod::ButtonAction::SIGNIN:      return ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_SIGNIN;
     default:                                     return ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_DEFAULT;
   }
 }
diff --git a/dali/public-api/adaptor-framework/input-method.h b/dali/public-api/adaptor-framework/input-method.h
index e3feac7..0cf9b1a 100644
--- a/dali/public-api/adaptor-framework/input-method.h
+++ b/dali/public-api/adaptor-framework/input-method.h
@@ -115,12 +115,9 @@ enum Type
   JOIN,        ///< Join action @SINCE_1_3.20
   LOGIN,       ///< Login action @SINCE_1_3.20
   NEXT,        ///< Next action @SINCE_1_3.20
-  PREVIOUS,    ///< Previous action @SINCE_1_3.20
   SEARCH,      ///< Search action @SINCE_1_3.20
   SEND,        ///< Send action @SINCE_1_3.20
-  SIGNIN,      ///< Sign in action @SINCE_1_3.20
-  UNSPECIFIED, ///< Unspecified action @SINCE_1_3.20
-  NONE         ///< Nothing to do @SINCE_1_3.20
+  SIGNIN       ///< Sign in action @SINCE_1_3.20
 };
 
 } // namespace ButtonAction