[TSAM-9277] Fix the slide bar displaysubmit/tizen_3.0_common/20161104.104000submit/tizen/20161024.040813accepted/tizen/wearable/20161028.150613accepted/tizen/mobile/20161028.150555accepted/tizen/common/20161024.134949accepted/tizen/3.0/common/20161114.105016

- and, minor fix about previous commit change

Signed-off-by: Jihoon Jung <jh8801.jung@samsung.com>
Change-Id: I138578c5f8601ec643d0d66ede41bdce84567929

4 files changed, 9 insertions, 10 deletions

diff --git a/wearable/app/include/nsa-main.h b/wearable/app/include/nsa-main.h
index f1b70ae..e13f5cb 100755
--- a/wearable/app/include/nsa-main.h
+++ b/wearable/app/include/nsa-main.h
@@ -58,6 +58,7 @@ typedef struct {
 	Evas_Object *main_layout;
 	Evas_Object *main_bg;
 	Evas_Object *conform;
+	Evas_Object *main_circle_obj;
 	Eext_Circle_Surface *circle_surface;
 
 	Evas_Object *popup;
diff --git a/wearable/app/src/nsa-main.c b/wearable/app/src/nsa-main.c
index 9371d39..88a3081 100755
--- a/wearable/app/src/nsa-main.c
+++ b/wearable/app/src/nsa-main.c
@@ -57,10 +57,7 @@ static void __back_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 		ad->radio_main = NULL;
 		ad->current_view = V_MAIN;
 
-		circle_obj = eext_circle_object_genlist_add(ad->main_genlist, ad->circle_surface);
-		eext_circle_object_genlist_scroller_policy_set(circle_obj,
-			ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_AUTO);
-		eext_rotary_object_event_activated_set(circle_obj, EINA_TRUE);
+		eext_rotary_object_event_activated_set(ad->main_circle_obj, EINA_TRUE);
 	} else if (ad->current_view == V_MAIN) {
 		/* release Main view and exit application */
 		NSA_MEM_FREE(ad->payment_handler);
diff --git a/wearable/app/src/nsa-view-main.c b/wearable/app/src/nsa-view-main.c
index 2bc5c53..8ccdbff 100755
--- a/wearable/app/src/nsa-view-main.c
+++ b/wearable/app/src/nsa-view-main.c
@@ -204,7 +204,6 @@ static Evas_Object *__create_nfc_setting_list(void *data)
 	appdata *ad = data;
 
 	Evas_Object *genlist;
-	Evas_Object *circle_obj;
 	Elm_Genlist_Item_Class *itc_title, *itc_on_off, *itc_list, *itc_padding;
 
 	retv_if(ad == NULL, NULL);
@@ -218,10 +217,10 @@ static Evas_Object *__create_nfc_setting_list(void *data)
 	/* set genlist property */
 	elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS);
 
-	circle_obj = eext_circle_object_genlist_add(genlist, ad->circle_surface);
-	eext_circle_object_genlist_scroller_policy_set(circle_obj,
+	ad->main_circle_obj = eext_circle_object_genlist_add(genlist, ad->circle_surface);
+	eext_circle_object_genlist_scroller_policy_set(ad->main_circle_obj,
 		ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_AUTO);
-	eext_rotary_object_event_activated_set(circle_obj, EINA_TRUE);
+	eext_rotary_object_event_activated_set(ad->main_circle_obj, EINA_TRUE);
 
 	/* create genlist class + */
 	itc_title = elm_genlist_item_class_new();
diff --git a/wearable/app/src/nsa-view-tap-n-pay.c b/wearable/app/src/nsa-view-tap-n-pay.c
index 0ccfa2b..1ef7560 100755
--- a/wearable/app/src/nsa-view-tap-n-pay.c
+++ b/wearable/app/src/nsa-view-tap-n-pay.c
@@ -84,6 +84,7 @@ static Evas_Object *__create_no_contents_ly(void *data)
 	appdata *ad = data;
 	Evas_Object *sc, *ly, *image, *circle_obj;
 	Evas_Object *label;
+	char title[256];
 
 	retv_if(ad == NULL, NULL);
 
@@ -116,7 +117,8 @@ static Evas_Object *__create_no_contents_ly(void *data)
 	evas_object_size_hint_align_set(label, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
 	elm_label_wrap_width_set(label, 226);
-	elm_object_text_set(label, "<font=Tizen:style=Medium font_size=30 color=#0094ffff align=center text_class=tizen>Tap and pay</font>");
+	snprintf(title, 256, "<font=Tizen:style=Medium font_size=30 color=#0094ffff align=center text_class=tizen>%s</font>", IDS_TAP_AND_PAY);
+	elm_object_text_set(label, title);
 	elm_object_part_content_set(ly, "elm.text.title", label);
 
 	evas_object_show(label);
@@ -500,7 +502,7 @@ bool _nsa_view_tap_n_pay_create(void *data)
 
 	retv_if(layout == NULL, false);
 
-	elm_naviframe_item_push(ad->navi_frame, "TAP", NULL, NULL, layout, "empty");
+	elm_naviframe_item_push(ad->navi_frame, NULL, NULL, NULL, layout, "empty");
 	ad->current_view = V_TAP_N_PAY;
 
 	return true;