From 875624d06e0e1496ccace06fc09e29e5092b1ae7 Mon Sep 17 00:00:00 2001 From: Jay Sharma Date: Mon, 28 Mar 2016 21:27:39 +0530 Subject: [PATCH] [Resource-Encapsulation] Fixed the Tizen sample app build issue. - Updated "NestedAttributeClientApp" Tizen app. Change-Id: I3cf63257fe3e23dde2cf1998ebccbb9d25de8388 Signed-off-by: Jay Sharma Reviewed-on: https://gerrit.iotivity.org/gerrit/7409 Reviewed-by: Hun-je Yeon Tested-by: jenkins-iotivity Reviewed-by: Uze Choi --- .../edc_resource/re_container_control.edc | 61 ---------------------- .../src/recontainerclient.cpp | 2 +- 2 files changed, 1 insertion(+), 62 deletions(-) diff --git a/service/resource-encapsulation/examples/tizen/NestedAttributeClientApp/edc_resource/re_container_control.edc b/service/resource-encapsulation/examples/tizen/NestedAttributeClientApp/edc_resource/re_container_control.edc index e394253..f8b53ab 100644 --- a/service/resource-encapsulation/examples/tizen/NestedAttributeClientApp/edc_resource/re_container_control.edc +++ b/service/resource-encapsulation/examples/tizen/NestedAttributeClientApp/edc_resource/re_container_control.edc @@ -60,64 +60,3 @@ group } } } - -group -{ - name: "popup_datetime_text"; - parts - { - part - { - name: "pad_l"; - type: SPACER; - scale: 1; - description - { - state: "default" 0.0; - min: POPUP_CONTENT_DEFAULT_PADDING_LEFT_MIN_INC 0; - fixed: 1 0; - rel1.relative: 0.0 0.0; - rel2.relative: 0.0 1.0; - align: 0.0 0.0; - } - } - part - { - name: "pad_r"; - type: SPACER; - scale: 1; - description - { - state: "default" 0.0; - min: POPUP_CONTENT_DEFAULT_PADDING_LEFT_MIN_INC 0; - fixed: 1 0; - rel1.relative: 1.0 0.0; - rel2.relative: 1.0 1.0; - align: 1.0 0.0; - } - } - part - { - name: "elm.swallow.content"; - type: SWALLOW; - scale: 1; - description - { - state: "default" 0.0; - min: 0 POPUP_EDITFIELD_LAYOUT_MINMAX_HEIGHT_INC; - max: -1 POPUP_EDITFIELD_LAYOUT_MINMAX_HEIGHT_INC; - align: 0.5 0.5; - rel1 - { - relative: 1.0 0.0; - to_x: "pad_l"; - } - rel2 - { - relative: 0.0 1.0; - to_x: "pad_r"; - } - } - } - } -} diff --git a/service/resource-encapsulation/examples/tizen/NestedAttributeClientApp/src/recontainerclient.cpp b/service/resource-encapsulation/examples/tizen/NestedAttributeClientApp/src/recontainerclient.cpp index 40662a7..ec9b7f4 100644 --- a/service/resource-encapsulation/examples/tizen/NestedAttributeClientApp/src/recontainerclient.cpp +++ b/service/resource-encapsulation/examples/tizen/NestedAttributeClientApp/src/recontainerclient.cpp @@ -102,7 +102,7 @@ void *showContainerAPIs(void *data) elm_list_item_append(listnew, "1. Find Light resource", NULL, NULL, findLight, NULL); - elm_list_item_append(listnew, "1. Find Softsensor resource", NULL, NULL, + elm_list_item_append(listnew, "2. Find Softsensor resource", NULL, NULL, findSoftsensor, NULL); elm_list_go(listnew); -- 2.7.4