add wallpaper bundle

Change-Id: Ia195c08257f5d7c80d4f4db550777113ba266d03

4 files changed, 41 insertions, 18 deletions

diff --git a/main/src/control/ivug-parameter.c b/main/src/control/ivug-parameter.c
index ae5232e..602c790 100755
--- a/main/src/control/ivug-parameter.c
+++ b/main/src/control/ivug-parameter.c
@@ -171,7 +171,9 @@ _get_setas_type(const char* val)
 {
 	IV_ASSERT(val != NULL);
 
-#define IVUG_BUNDLE_VALUE_SETAS_UG_WALLPAPER	"Wallpaper"
+#define IVUG_BUNDLE_VALUE_SETAS_UG_WALLPAPER	"Wallpaper"

+#define IVUG_BUNDLE_VALUE_SETAS_UG_LOCKSCREEN	"Lockscreen"

+#define IVUG_BUNDLE_VALUE_SETAS_UG_WALLPAPER_N_LOCKSCREEN	"Wallpaper & Lockscreen"

 #define IVUG_BUNDLE_VALUE_SETAS_UG_CALLERID		"CallerID"
 #define IVUG_BUNDLE_VALUE_SETAS_UG_VIDEO_CALLEID	"VideoCallID"
 #define IVUG_BUNDLE_VALUE_SETAS_UG_CROP			"Crop"
@@ -186,7 +188,15 @@ _get_setas_type(const char* val)
 	else if (strncmp(val, IVUG_BUNDLE_VALUE_SETAS_UG_WALLPAPER_ONLY, len) == 0 )
 	{
 		return IVUG_SET_AS_UG_TYPE_WALLPAPER_ONLY;
-	}
+	}

+	else if (strncmp(val, IVUG_BUNDLE_VALUE_SETAS_UG_LOCKSCREEN, len) == 0 )

+	{

+		return IVUG_SET_AS_UG_TYPE_LOCKSCREEN;

+	}

+	else if (strncmp(val, IVUG_BUNDLE_VALUE_SETAS_UG_WALLPAPER_N_LOCKSCREEN, len) == 0 )

+	{

+		return IVUG_SET_AS_UG_TYPE_WALLPAPER_N_LOCKSCREEN;

+	}

 	else if (strncmp(val, IVUG_BUNDLE_VALUE_SETAS_UG_CALLERID, len) == 0)
 	{
 		return IVUG_SET_AS_UG_TYPE_CALLER_ID;
diff --git a/main/src/control/ivug-parameter.h b/main/src/control/ivug-parameter.h
index 7a97336..f357109 100755
--- a/main/src/control/ivug-parameter.h
+++ b/main/src/control/ivug-parameter.h
@@ -35,7 +35,9 @@ typedef enum {
 //set as ug
 typedef enum {
 	IVUG_SET_AS_UG_TYPE_INVALID = 0x00,
-	IVUG_SET_AS_UG_TYPE_WALLPAPER,
+	IVUG_SET_AS_UG_TYPE_WALLPAPER,

+	IVUG_SET_AS_UG_TYPE_LOCKSCREEN,

+	IVUG_SET_AS_UG_TYPE_WALLPAPER_N_LOCKSCREEN,

 	IVUG_SET_AS_UG_TYPE_CALLER_ID,
 	IVUG_SET_AS_UG_TYPE_VIDEO_CALL_ID,
 	IVUG_SET_AS_UG_TYPE_CROP,			// For OSP
diff --git a/main/src/ug-image-viewer.c b/main/src/ug-image-viewer.c
index ab2377f..0477b6f 100755
--- a/main/src/ug-image-viewer.c
+++ b/main/src/ug-image-viewer.c
@@ -231,20 +231,21 @@ static void *on_create(ui_gadget_h ug, enum ug_mode mode, service_h service, voi
 			ugd->setas_view = ivug_setas_view_video_call_id_ug_create(ugd->base, ugd->ivug_param->filepath,
 				setas_mode, ugd->ivug_param->width, ugd->ivug_param->height);
 		}
-		else if(ugd->ivug_param->setas_type == IVUG_SET_AS_UG_TYPE_WALLPAPER)
-		{
-			// From Wall paper in Setting
-			if(setas_mode == IVUG_SETAS_APPSVC)
-			{
-				ugd->setas_view = ivug_setas_view_screen_ug_create(ugd->base, ugd->ivug_param->filepath,
-					setas_mode, IVUG_CTRLBAR_SET_SCREEN_HOME);
-			}
-			else
-			{
-				ugd->setas_view = ivug_setas_view_screen_ug_create(ugd->base, ugd->ivug_param->filepath,
-					setas_mode, IVUG_CTRLBAR_SET_SCREEN_UNDEFINED);
-			}
-		}
+		else if(ugd->ivug_param->setas_type == IVUG_SET_AS_UG_TYPE_WALLPAPER)

+		{

+			ugd->setas_view = ivug_setas_view_screen_ug_create(ugd->base, ugd->ivug_param->filepath,

+				setas_mode, IVUG_CTRLBAR_SET_SCREEN_HOME);

+		}

+		else if(ugd->ivug_param->setas_type == IVUG_SET_AS_UG_TYPE_LOCKSCREEN)

+		{

+			ugd->setas_view = ivug_setas_view_screen_ug_create(ugd->base, ugd->ivug_param->filepath,

+				setas_mode, IVUG_CTRLBAR_SET_SCREEN_LOCK);

+		}

+		else if(ugd->ivug_param->setas_type == IVUG_SET_AS_UG_TYPE_WALLPAPER_N_LOCKSCREEN)

+		{

+			ugd->setas_view = ivug_setas_view_screen_ug_create(ugd->base, ugd->ivug_param->filepath,

+				setas_mode, IVUG_CTRLBAR_SET_SCREEN_BOTH);

+		}

 		else if(ugd->ivug_param->setas_type == IVUG_SET_AS_UG_TYPE_CROP)
 		{
 			// Crop UG
diff --git a/main/src/view/ivug-setas-view.c b/main/src/view/ivug-setas-view.c
index 54b80f4..9690e1a 100755
--- a/main/src/view/ivug-setas-view.c
+++ b/main/src/view/ivug-setas-view.c
@@ -510,7 +510,17 @@ _on_type_popup_selected(void *data, Evas_Object *obj, void *event_info)
 
 static void _dismissed_cb(void *data, Evas_Object *obj, void *event_info)
 {
-	MSG_SETAS_HIGH("Popup dissmissed");
+	IV_ASSERT(data != NULL);

+

+	MSG_SETAS_HIGH("Popup dissmissed");

+

+	Ivug_SetAsView *pSetAsView = (Ivug_SetAsView *) data;

+

+	if(pSetAsView->genlist_popup)

+	{

+		evas_object_del(pSetAsView->genlist_popup);

+		pSetAsView->genlist_popup = NULL;

+	}

 }