From 63b6b00aa76ea7041f905923b4c9d7aaaa69b96a Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Fri, 21 Aug 2020 10:20:07 +0100 Subject: [PATCH] Remove deprecated and unused ActionButton Change-Id: I60c72525a5edc4e4e4ba46482be34e46222e9cd2 --- .../input/windows/virtual-keyboard-impl-win.cpp | 5 +--- dali/public-api/adaptor-framework/input-method.h | 28 ---------------------- 2 files changed, 1 insertion(+), 32 deletions(-) mode change 100755 => 100644 dali/internal/input/windows/virtual-keyboard-impl-win.cpp diff --git a/dali/internal/input/windows/virtual-keyboard-impl-win.cpp b/dali/internal/input/windows/virtual-keyboard-impl-win.cpp old mode 100755 new mode 100644 index 8d4eb0a..e833efa --- a/dali/internal/input/windows/virtual-keyboard-impl-win.cpp +++ b/dali/internal/input/windows/virtual-keyboard-impl-win.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -87,9 +87,6 @@ Dali::VirtualKeyboard::TextDirection GetTextDirection() return Dali::VirtualKeyboard::LeftToRight; } -Dali::InputMethod::ActionButton gActionButtonFunction = Dali::InputMethod::ACTION_DEFAULT; - - void RotateTo(int angle) { } diff --git a/dali/public-api/adaptor-framework/input-method.h b/dali/public-api/adaptor-framework/input-method.h index f1fd42f..78fc5a9 100644 --- a/dali/public-api/adaptor-framework/input-method.h +++ b/dali/public-api/adaptor-framework/input-method.h @@ -222,34 +222,6 @@ enum Type } // namespace PasswordLayout - -/** - * @DEPRECATED_1_3.20 Use ButtonAction instead. - * @brief Enumeration for specifying what the Input Method "action" button functionality is set to. - * - * The 'Action' button is traditionally the [RETURN] or [DONE] button. - * - * Not all these actions are supported by all systems. - * - * Setting a custom label will still require one of these actions to be set. - * @SINCE_1_0.0 - */ -enum ActionButton -{ - ACTION_DEFAULT, ///< Default action @SINCE_1_0.0 - ACTION_DONE, ///< Done @SINCE_1_0.0 - ACTION_GO, ///< Go action @SINCE_1_0.0 - ACTION_JOIN, ///< Join action @SINCE_1_0.0 - ACTION_LOGIN, ///< Login action @SINCE_1_0.0 - ACTION_NEXT, ///< Next action @SINCE_1_0.0 - ACTION_PREVIOUS, ///< Previous action @SINCE_1_0.0 - ACTION_SEARCH, ///< Search action @SINCE_1_0.0 - ACTION_SEND, ///< Send action @SINCE_1_0.0 - ACTION_SIGNIN, ///< Sign in action @SINCE_1_0.0 - ACTION_UNSPECIFIED, ///< Unspecified action @SINCE_1_0.0 - ACTION_NONE ///< Nothing to do @SINCE_1_0.0 -}; - } // namespace InputMethod /** -- 2.7.4