IAppWidgetAddRequestListener -> IAppWidgetRequestListener

Change-Id: I03c86acf614d2ae98d75473bdddccb5ca31bd4f6
Signed-off-by: jungmin76.park <jungmin76.park@samsung.com>

diff --git a/inc/FShell.h b/inc/FShell.h
index e566b43..29c45c2 100644 (file)
--- a/inc/FShell.h
+++ b/inc/FShell.h
@@ -40,7 +40,7 @@
 #include <FShellAppWidgetProviderManager.h>
 #include <FShellAppWidgetFrame.h>
 #include <FShellAppWidgetPopup.h>
-#include <FShellIAppWidgetAddRequestListener.h>
+#include <FShellIAppWidgetRequestListener.h>
 #include <FShellShortcutManager.h>
 #include <FShellIShortcutRequestListener.h>
 #include <FShellLockManager.h>

diff --git a/inc/FShellAppWidgetManager.h b/inc/FShellAppWidgetManager.h
index 042ac4e..82da6ca 100644 (file)
--- a/inc/FShellAppWidgetManager.h
+++ b/inc/FShellAppWidgetManager.h
@@ -34,17 +34,17 @@ namespace Tizen { namespace Shell
 {
 
 class AppWidgetProviderInfo;
-class IAppWidgetAddRequestListener;
+class IAppWidgetRequestListener;
 
 /**
  * @class              AppWidgetManager
- * @brief              Manages static information of all the AppWidgetes and provides APIs for AppWidget viewer(Such as the Home screen).
+ * @brief              Manages static information of all the AppWidgets and provides APIs for AppWidget viewer(Such as the Home screen).
  *
  * @since      2.1
  *
  * @final              This class is not intended for extension.
  *
- * The %AppWidgetManager class manages static information of all the AppWidgetes and deliveries request to add AppWidget.
+ * The %AppWidgetManager class manages static information of all the AppWidgets and deliveries request to add AppWidget.
  */
 class _OSP_EXPORT_ AppWidgetManager
        : public Tizen::Base::Object
@@ -121,10 +121,10 @@ public:
         * @exception   E_SUCCESS               The method is successful.
         * @exception   E_SYSTEM                The method cannot proceed due to a severe system error.
         *
-        * @see         IAppWidgetAddRequestListener
+        * @see         IAppWidgetRequestListener
         * @remarks     Platform does not have the ownership of this pointer, So caller should manage the listener object properly.
         */
-       result SetAppWidgetAddRequestListener(IAppWidgetAddRequestListener* pListener);
+       result SetAppWidgetRequestListener(IAppWidgetRequestListener* pListener);
 
 private:
        //

diff --git a/inc/FShellAppWidgetProviderManager.h b/inc/FShellAppWidgetProviderManager.h
index 7637207..8815ac5 100644 (file)
--- a/inc/FShellAppWidgetProviderManager.h
+++ b/inc/FShellAppWidgetProviderManager.h
@@ -107,7 +107,7 @@ public:
         * @exception   E_SYSTEM                        The method cannot proceed due to a severe system error.
         *
         * @remarks     Only AppWidget provider that is packaged with the caller application can be added by this API.
-        * @see         SetAppWidgetAddRequestListener
+        * @see         SetAppWidgetRequestListener
         */
        result AddAppWidget(const Tizen::App::AppId& providerAppId, const Tizen::Base::String& providerName, const Tizen::Base::String& alternateText, const Tizen::Base::String& userInfo);
 

diff --git a/inc/FShellIAppWidgetPopupProviderFactory.h b/inc/FShellIAppWidgetPopupProviderFactory.h
index 3d5d179..c322911 100644 (file)
--- a/inc/FShellIAppWidgetPopupProviderFactory.h
+++ b/inc/FShellIAppWidgetPopupProviderFactory.h
@@ -52,7 +52,7 @@ public:
         *
         * @since       2.1
         */
-       virtual ~IAppWidgetPopupProviderFactory() {};
+       virtual ~IAppWidgetPopupProviderFactory(void) {};
 
        /**
         * Creates a AppWidgetPopupProvider instance@n

diff --git a/inc/FShellIAppWidgetProviderFactory.h b/inc/FShellIAppWidgetProviderFactory.h
index dab35ef..bb995db 100644 (file)
--- a/inc/FShellIAppWidgetProviderFactory.h
+++ b/inc/FShellIAppWidgetProviderFactory.h
@@ -53,7 +53,7 @@ public:
         *
         * @since       2.1
         */
-       virtual ~IAppWidgetProviderFactory() {};
+       virtual ~IAppWidgetProviderFactory(void) {};
 
        /**
         * Called when the AppWidgetProvider creation request is received from the appwidget service. @n

diff --git a/inc/FShellIAppWidgetAddRequestListener.h b/inc/FShellIAppWidgetRequestListener.h
similarity index 84%
rename from inc/FShellIAppWidgetAddRequestListener.h
rename to inc/FShellIAppWidgetRequestListener.h
index e0b3e01..a261bf6 100644 (file)
--- a/inc/FShellIAppWidgetAddRequestListener.h
+++ b/inc/FShellIAppWidgetRequestListener.h
@@ -16,10 +16,10 @@
 //
 
 /**
- * @file               FShellIAppWidgetAddRequestListener.h
- * @brief              This is the header file for the %IAppWidgetAddRequestListener interface.
+ * @file               FShellIAppWidgetRequestListener.h
+ * @brief              This is the header file for the %IAppWidgetRequestListener interface.
  *
- * This header file contains the declarations of the %IAppWidgetAddRequestListener interface.
+ * This header file contains the declarations of the %IAppWidgetRequestListener interface.
  */
 
 #ifndef _FSHELL_IAPPWIDGET_ADD_REQUEST_LISTENER_H_
@@ -33,14 +33,14 @@ namespace Tizen { namespace Shell
 {
 
 /**
- * @interface  IAppWidgetAddRequestListener
- * @brief              This interface defines a listener for a AppWidget viewer(eg, Home screen, Lock screen) that receives request to add AppWidget
+ * @interface  IAppWidgetRequestListener
+ * @brief              This interface defines a listener for a AppWidget viewer(eg, Home screen) that receives request to add AppWidget
  *
  * @since      2.1
  *
- * The %IAppWidgetAddRequestListener interface defines a listener for a AppWidget viewer(eg, Home screen, Lock screen) that receives request to add AppWidget
+ * The %IAppWidgetRequestListener interface defines a listener for a AppWidget viewer(eg, Home screen) that receives request to add AppWidget
  */
-class _OSP_EXPORT_ IAppWidgetAddRequestListener
+class _OSP_EXPORT_ IAppWidgetRequestListener
  : virtual public Tizen::Base::Runtime::IEventListener
 {
 public:
@@ -50,7 +50,7 @@ public:
         *
         * @since       2.1
         */
-       virtual ~IAppWidgetAddRequestListener() {}
+       virtual ~IAppWidgetRequestListener(void) {}
 
        /**
         * Called when requested to add a AppWidget @n

diff --git a/inc/FShellLockManager.h b/inc/FShellLockManager.h
index ed4e4a1..65962e5 100644 (file)
--- a/inc/FShellLockManager.h
+++ b/inc/FShellLockManager.h
@@ -82,7 +82,7 @@ public:
        /**
         * Unlocks current lock screen.
 
-        * @privlevel   partner
+        * @privlevel   platform
         * @privilege   http://tizen.org/privilege/lockmanager
         *
         * @since       2.1

diff --git a/src/FShellAppWidgetManager.cpp b/src/FShellAppWidgetManager.cpp
index f9f9245..611d8ca 100644 (file)
--- a/src/FShellAppWidgetManager.cpp
+++ b/src/FShellAppWidgetManager.cpp
@@ -37,7 +37,7 @@
 
 #include <FShellAppWidgetManager.h>
 #include <FShellAppWidgetProviderInfo.h>
-#include <FShellIAppWidgetAddRequestListener.h>
+#include <FShellIAppWidgetRequestListener.h>
 #include "FShell_AppWidgetManagerImpl.h"
 
 using namespace std;
@@ -132,9 +132,9 @@ AppWidgetManager::GetDefaultAppWidgetProviderInfoN(const Tizen::App::PackageId&
 }
 
 result
-AppWidgetManager::SetAppWidgetAddRequestListener(IAppWidgetAddRequestListener* pListener)
+AppWidgetManager::SetAppWidgetRequestListener(IAppWidgetRequestListener* pListener)
 {
-       return __pAppWidgetManagerImpl->SetAppWidgetAddRequestListener(pListener);
+       return __pAppWidgetManagerImpl->SetAppWidgetRequestListener(pListener);
 }
 
 

diff --git a/src/FShell_AppWidgetManagerImpl.cpp b/src/FShell_AppWidgetManagerImpl.cpp
index 67ca67c..c112e80 100644 (file)
--- a/src/FShell_AppWidgetManagerImpl.cpp
+++ b/src/FShell_AppWidgetManagerImpl.cpp
@@ -38,7 +38,7 @@
 #include <FShellAppWidgetFrame.h>
 #include <FShellAppWidgetPopup.h>
 
-#include <FShellIAppWidgetAddRequestListener.h>
+#include <FShellIAppWidgetRequestListener.h>
 #include <FShellIAppWidgetProviderFactory.h>
 #include <FShellIAppWidgetPopupProviderFactory.h>
 
@@ -237,14 +237,14 @@ int AppWidgetRequestHandlerCallback(const char* providerId, const char* text, in
        String providerName;
        _AppWidgetManagerImpl::ExtractAppIdAndProviderName(providerId, appId, providerName);
 
-       IAppWidgetAddRequestListener* pListener = _AppWidgetManagerImpl::GetInstance()->GetAddRequestListener();
+       IAppWidgetRequestListener* pListener = _AppWidgetManagerImpl::GetInstance()->GetAddRequestListener();
        SysTryReturn(NID_APP, pAppWidgetManager, 0, E_SYSTEM, "[E_SYSTEM] pListener is null!");
        pListener->OnAppWidgetAddRequested(appId, providerName, text, content_info);
        return 0;
 }
 
 result
-_AppWidgetManagerImpl::SetAppWidgetAddRequestListener(IAppWidgetAddRequestListener* pListener)
+_AppWidgetManagerImpl::SetAppWidgetRequestListener(IAppWidgetRequestListener* pListener)
 {
 //     int ret = shortcut_set_request_cb(AppWidgetRequestHandlerCallback, this );
 //     SysTryReturnResult(NID_APP, ret == 0, E_SYSTEM, "failed to shortcut_set_request_cb (%d)", ret);
@@ -254,7 +254,7 @@ _AppWidgetManagerImpl::SetAppWidgetAddRequestListener(IAppWidgetAddRequestListen
        return E_SUCCESS;
 }
 
-IAppWidgetAddRequestListener*
+IAppWidgetRequestListener*
 _AppWidgetManagerImpl::GetAddRequestListener()
 {
        return __pAppWidgetRequestEventListener;

diff --git a/src/FShell_AppWidgetProviderManagerImpl.cpp b/src/FShell_AppWidgetProviderManagerImpl.cpp
index 1d5e9bf..d170f02 100644 (file)
--- a/src/FShell_AppWidgetProviderManagerImpl.cpp
+++ b/src/FShell_AppWidgetProviderManagerImpl.cpp
@@ -74,6 +74,7 @@ const char APPWIDGET_ON_TOUCH[] = "http://tizen.org/appcontrol/appwidget/touch";
 const char APPWIDGET_POPUP_ON_CREATE[] = "http://tizen.org/appcontrol/appwidgetpopup/create";
 const char APPWIDGET_POPUP_ON_DESTROY[] = "http://tizen.org/appcontrol/appwidgetpopup/destroy";
 const char APPWIDGET_POPUP_ON_TOUCH[] = "http://tizen.org/appcontrol/appwidgetpopup/touch";
+const char APPWIDGET_POPUP_PREFIX[] = "http://tizen.org/appcontrol/appwidgetpopup";
 
 const String ARG_KEY_INSTANCE_ID = L"_InstanceId";
 const String ARG_KEY_PROVIDER_NAME = L"_ProviderName";
@@ -92,7 +93,6 @@ _AppWidgetProviderManagerImpl::_AppWidgetProviderManagerImpl()
        ,__pAppWidgetPopupProviderFactory(null)
        ,__pAppWidgetPopupProvider(null)
        ,__AppWidgetPopupTouchEventListener(null)
-//     ,__messageReceived(false)
 {
        SysLog(NID_APP, "");
 }
@@ -340,7 +340,7 @@ _AppWidgetProviderManagerImpl::OnAppControlRequestReceived(RequestId reqId, cons
 
        SysLog(NID_APP, "id(%ls), name(%ls), param(%ls)", pInstanceId->GetPointer(), pName->GetPointer(), pParam->GetPointer());
 
-       if(operationId.StartsWith(L"http://tizen.org/appcontrol/appwidgetpopup", 0) == true)
+       if(operationId.StartsWith(APPWIDGET_POPUP_PREFIX, 0) == true)
        {
                SysTryReturnVoidResult(NID_APP, __pAppWidgetPopupProviderFactory, E_FAILURE, "[E_FAILURE] __pAppWidgetPopupProviderFactory is null");
                HandleAppWidgetPopupRequest(operationId, pArgs);

diff --git a/src/inc/FShell_AppWidgetManagerImpl.h b/src/inc/FShell_AppWidgetManagerImpl.h
index a473205..189b4ec 100644 (file)
--- a/src/inc/FShell_AppWidgetManagerImpl.h
+++ b/src/inc/FShell_AppWidgetManagerImpl.h
@@ -48,10 +48,10 @@ public:
        Tizen::Base::Collection::IList* GetAppWidgetProviderInfoListN();
        AppWidgetProviderInfo* GetAppWidgetProviderInfoN(const Tizen::App::AppId& appId, const Tizen::Base::String& providerName);
        AppWidgetProviderInfo* GetDefaultAppWidgetProviderInfoN(const Tizen::App::PackageId& packageId);
-       result SetAppWidgetAddRequestListener(IAppWidgetAddRequestListener* pListener);
+       result SetAppWidgetRequestListener(IAppWidgetRequestListener* pListener);
 
        // internal
-       IAppWidgetAddRequestListener* GetAddRequestListener();
+       IAppWidgetRequestListener* GetAddRequestListener();
        static bool IsAppWidgetProviderDefault(const Tizen::App::AppId& appId, const Tizen::Base::String& providerName);// temp
 
        // helper
@@ -64,7 +64,7 @@ private:
        result Construct();
 
 private:
-       IAppWidgetAddRequestListener* __pAppWidgetRequestEventListener;
+       IAppWidgetRequestListener* __pAppWidgetRequestEventListener;
 
 };