fixed UC for TV profile 64/126564/2 accepted/tizen/unified/20170426.061807 submit/tizen/20170426.005625 tizen_4.0.m1_release
authorjomui <jongmun.woo@samsung.com>
Mon, 24 Apr 2017 07:26:44 +0000 (16:26 +0900)
committerjomui <jongmun.woo@samsung.com>
Wed, 26 Apr 2017 00:48:17 +0000 (09:48 +0900)
Signed-off-by: jomui <jongmun.woo@samsung.com>
Change-Id: I30b25de1338e4db706f4c9b85bea6e43992388e8

heremaps-uc/src/heremaps-uc.c

index 6eab4e2..bd9fa00 100644 (file)
@@ -195,23 +195,15 @@ static Evas_Object *create_popup_tv(Evas_Object *layout, heremaps_uc_app_data *a
 
        /* popup */
        popup = elm_popup_add(layout);
-       elm_object_style_set(popup, "default");
        eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, back_btn_cb, ad);
        evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        elm_object_part_text_set(popup, "title,text", P_("IDS_POSITIONING_CONSENT_TITLE"));
 
        Evas_Object *box = elm_box_add(popup);
        elm_box_align_set(box, 0.5, 0);
+       elm_object_part_content_set(popup, "elm.swallow.content", box);
        evas_object_show(box);
 
-       Evas_Object *scroller = elm_scroller_add(box);
-       elm_scroller_bounce_set(scroller, EINA_FALSE, EINA_TRUE);
-       elm_scroller_policy_set(scroller, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_AUTO);
-       evas_object_size_hint_weight_set(scroller, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       evas_object_size_hint_align_set(scroller, EVAS_HINT_FILL, EVAS_HINT_FILL);
-       evas_object_size_hint_padding_set(scroller, 5, 5, 0, 0);
-       evas_object_show(scroller);
-
        char buf[4096] = {0};
        char *str1 = P_("IDS_POSITIONING_CONSENT_BODY");
        char *str2 = "<color=#006fd1ff underline=on underline_color=#006fd1ff><a href=http://here.com/terms/service-terms>http://here.com/terms/service-terms</a></color>";
@@ -219,19 +211,15 @@ static Evas_Object *create_popup_tv(Evas_Object *layout, heremaps_uc_app_data *a
        snprintf(buf, 4096, str1, str2, str3);
        char *text = strdup(buf);
 
-       Evas_Object* entry = elm_entry_add(scroller);
-       evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       Evas_Object* entry = elm_entry_add(box);
+       evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, 0.0);
        evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, EVAS_HINT_FILL);
-       evas_object_size_hint_padding_set(entry, 5, 5, 0, 0);
        elm_entry_editable_set(entry, EINA_FALSE);
        elm_object_part_text_set(entry, "elm.text", text);
-       elm_entry_text_style_user_push(entry, "DEFAULT='align=center color=#000000'");
+       elm_entry_text_style_user_push(entry, "DEFAULT='align=center'");
+       elm_box_pack_end(box, entry);
        evas_object_show(entry);
 
-       elm_object_content_set(scroller, entry);
-       elm_box_pack_end(box, scroller);
-       elm_object_part_content_set(popup, "elm.swallow.content", box);
-
        /* Disagree button */
        disagree_btn = elm_button_add(popup);
        elm_object_style_set(disagree_btn, "popup");