Merge commits Tizen 2.2 to Tizen 2.2.1

Change-Id: Ie2d8f3e37e2096aca32c29a113afe6c6a0331028
Signed-off-by: howon kim <howon.kim@samsung.com>

diff --git a/inc/FUixSpeechSpeechToText.h b/inc/FUixSpeechSpeechToText.h
index 83dc88b..564f672 100644 (file)
--- a/inc/FUixSpeechSpeechToText.h
+++ b/inc/FUixSpeechSpeechToText.h
@@ -190,20 +190,14 @@ public:
 
     /**
      * Initializes the Speech-To-Text service. @n
-     * The %Initialize() method is asynchronous. @n
+     * This method is asynchronous. @n
      * The ISpeechToTextEventListener::OnSpeechToTextInitialized() is invoked when the service has been initialized.
      * @since 2.0
      *
-     * @feature           %http://tizen.org/feature/speech.recognition
-     *
      * @return      An error code
      * @exception   E_SUCCESS           The method is successful.
-     * @exception  E_UNSUPPORTED_OPERATION   The Emulator or target device does not support the required feature. @b Since: @b 2.1
-     * For more information, see <a href="../org.tizen.gettingstarted/html/tizen_overview/application_filtering.htm">Application Filtering</a>.
-     * @remarks     
-     *                 - Before calling this method, check whether the feature is supported by 
-     *                 Tizen::System::SystemInfo::GetValue(const Tizen::Base::String&, bool&).
-     *                         - This method must be called after Construct().
+     * @exception   E_OUT_OF_MEMORY     The memory is insufficient.
+     * @remarks     This method must be called after Construct().
      */
     result Initialize(void);
 

diff --git a/inc/FUixSpeechSpeechToTextTypes.h b/inc/FUixSpeechSpeechToTextTypes.h
index e514d98..885d7c8 100644 (file)
--- a/inc/FUixSpeechSpeechToTextTypes.h
+++ b/inc/FUixSpeechSpeechToTextTypes.h
@@ -31,7 +31,7 @@ namespace Tizen { namespace Uix { namespace Speech
 /**
 * @enum SpeechToTextStatus
 *
-* Defines the SpeechToText status.
+* Defines the %SpeechToText status.
 *
 * @since 2.0
 *
@@ -48,7 +48,7 @@ enum SpeechToTextStatus
 /**
 * @enum SpeechToTextGrammar
 *
-* Defines the SpeechToText grammar.
+* Defines the %SpeechToText grammar.
 *
 * @since 2.0
 *
@@ -63,7 +63,7 @@ enum SpeechToTextGrammar
 /**
 * @enum SpeechToTextError
 *
-* Defines the errors in SpeechToText. @n
+* Defines the errors in %SpeechToText. @n
 * When an error occurs, the user can not receive any %SpeechToText result.
 *
 * @since 2.0

diff --git a/inc/FUixSpeechTextToSpeech.h b/inc/FUixSpeechTextToSpeech.h
index 7fcb35e..7dbcd90 100644 (file)
--- a/inc/FUixSpeechTextToSpeech.h
+++ b/inc/FUixSpeechTextToSpeech.h
@@ -188,21 +188,15 @@ public:
 
     /**
      * Initializes the Text-To-Speech service. @n
-     * The %Initialize() method is asynchronous. @n
+     * This method is asynchronous. @n
      * The ITextToSpeechEventListener::OnTextToSpeechInitialized() is invoked when the service has been initialized.
      *
      * @since 2.0
-     *
-     * @feature           %http://tizen.org/feature/speech.synthesis
-     *
+        *
      * @return      An error code
      * @exception   E_SUCCESS           The method is successful.
-     * @exception  E_UNSUPPORTED_OPERATION   The Emulator or target device does not support the required feature. @b Since: @b 2.1
-     * For more information, see <a href="../org.tizen.gettingstarted/html/tizen_overview/application_filtering.htm">Application Filtering</a>.
-     * @remarks     
-     *                 - Before calling this method, check whether the feature is supported by 
-     *                 Tizen::System::SystemInfo::GetValue(const Tizen::Base::String&, bool&).
-     *                         - This method must be called after Construct().
+     * @exception   E_OUT_OF_MEMORY     The memory is insufficient.
+     * @remarks     This method must be called after Construct().
      */
        result Initialize(void);
 

diff --git a/src/stt/FUixSpeech_SpeechToTextImpl.cpp b/src/stt/FUixSpeech_SpeechToTextImpl.cpp
index ad1a958..11cb404 100644 (file)
--- a/src/stt/FUixSpeech_SpeechToTextImpl.cpp
+++ b/src/stt/FUixSpeech_SpeechToTextImpl.cpp
@@ -26,7 +26,6 @@
 #include <FBaseColIList.h>\r
 #include <FBaseColArrayList.h>\r
 #include <FBaseString.h>\r
-#include <FSystem.h>\r
 #include <FBaseUtilStringTokenizer.h>\r
 #include <FLclLocale.h>\r
 #include <FUixSpeechSpeechToText.h>\r
@@ -37,7 +36,6 @@
 using namespace Tizen::Base;\r
 using namespace Tizen::Base::Collection;\r
 using namespace Tizen::Locales;\r
-using namespace Tizen::System;\r
 \r
 namespace Tizen { namespace Uix { namespace Speech\r
 {\r
@@ -267,13 +265,9 @@ _SpeechToTextImpl::Construct(ISpeechToTextEventListener& listener)
 result\r
 _SpeechToTextImpl::Initialize(void)\r
 {\r
-       bool isSupported;\r
-       SysAssertf(__isInitialized != true,\r
+    SysAssertf(__isInitialized != true,\r
                 "Already calling Initialize() twice or more on a same instance is not allowed for this class.");\r
 \r
-       Tizen::System::SystemInfo::GetValue("http://tizen.org/feature/speech.recognition", isSupported);        \r
-    SysTryReturnResult(NID_UIX_SPEECH, isSupported == true, E_UNSUPPORTED_OPERATION, "The STT is Not supported");\r
-\r
     int sttError = stt_set_error_cb(__sttHandle, SttErrorReceiver, __pSpeechToTextListener);\r
     SysTryLog(NID_UIX_SPEECH, sttError == STT_ERROR_NONE, "[%s] Failed to set the error callback.", GetEngineErrorMessage(sttError));\r
     SysTryReturnResult(NID_UIX_SPEECH, sttError == STT_ERROR_NONE, E_OUT_OF_MEMORY, "The memory is insufficient.");\r

diff --git a/src/tts/FUixSpeech_TextToSpeechImpl.cpp b/src/tts/FUixSpeech_TextToSpeechImpl.cpp
index 684a112..c87acde 100644 (file)
--- a/src/tts/FUixSpeech_TextToSpeechImpl.cpp
+++ b/src/tts/FUixSpeech_TextToSpeechImpl.cpp
@@ -26,7 +26,6 @@
 #include <FBaseColIList.h>
 #include <FBaseColArrayList.h>
 #include <FBaseString.h>
-#include <FSystem.h>
 #include <FBaseUtilStringTokenizer.h>
 #include <FLclLocale.h>
 #include <FUixSpeechTextToSpeech.h>
@@ -37,7 +36,6 @@
 using namespace Tizen::Base;
 using namespace Tizen::Base::Collection;
 using namespace Tizen::Locales;
-using namespace Tizen::System;
 
 #ifdef __cplusplus
 extern "C"
@@ -289,13 +287,9 @@ _TextToSpeechImpl::Construct(ITextToSpeechEventListener& listener)
 result
 _TextToSpeechImpl::Initialize(void)
 {
-    bool isSupported;
     SysAssertf(__isInitialized != true,
                 "Already calling Initialize() twice or more on a same instance is not allowed for this class.");
 
-       Tizen::System::SystemInfo::GetValue("http://tizen.org/feature/speech.synthesis", isSupported);
-    SysTryReturnResult(NID_UIX_SPEECH, isSupported == true, E_UNSUPPORTED_OPERATION, "The TTS is Not supported");
-
     int ttsError = tts_set_error_cb(__ttsHandle, TtsErrorReceiver, (void*)(__pTextToSpeechListener));
     SysTryLog(NID_UIX_SPEECH, ttsError == TTS_ERROR_NONE, "[%s] Failed to set the error callback.", GetEngineErrorMessage(ttsError));
     SysTryReturnResult(NID_UIX_SPEECH, ttsError == TTS_ERROR_NONE, E_OUT_OF_MEMORY, "The memory is insufficient.");