From 65953c7908633b4d9c2de4960fa6ab4c7b8ab5e9 Mon Sep 17 00:00:00 2001 From: jomui Date: Wed, 7 Sep 2016 13:58:34 +0900 Subject: [PATCH] fix UC popup as wearable style Signed-off-by: jomui Change-Id: I19009e3be0b9fa144ce0a7cfa3a319ed874129e1 --- CMakeLists.txt | 3 +- heremaps-uc/CMakeLists.txt | 10 + heremaps-uc/org.tizen.heremaps-uc.xml | 2 +- heremaps-uc/resources/edje/CMakeLists.txt | 12 ++ heremaps-uc/resources/edje/heremaps-uc.edc | 8 + heremaps-uc/resources/edje/macros.edc | 229 +++++++++++++++++++++ .../resources/images/tw_ic_popup_btn_check.png | Bin 0 -> 1331 bytes .../resources/images/tw_ic_popup_btn_delete.png | Bin 0 -> 1457 bytes heremaps-uc/resources/po/CMakeLists.txt | 2 +- heremaps-uc/resources/po/ar.po | 6 +- heremaps-uc/resources/po/az.po | 6 +- heremaps-uc/resources/po/bg.po | 6 +- heremaps-uc/resources/po/ca.po | 6 +- heremaps-uc/resources/po/cs.po | 6 +- heremaps-uc/resources/po/da.po | 6 +- heremaps-uc/resources/po/de.po | 6 +- heremaps-uc/resources/po/el.po | 6 +- heremaps-uc/resources/po/el_GR.po | 6 +- heremaps-uc/resources/po/en.po | 6 +- heremaps-uc/resources/po/en_GB.po | 6 +- heremaps-uc/resources/po/en_PH.po | 6 +- heremaps-uc/resources/po/en_US.po | 6 +- heremaps-uc/resources/po/es.po | 6 +- heremaps-uc/resources/po/es_MX.po | 6 +- heremaps-uc/resources/po/es_US.po | 6 +- heremaps-uc/resources/po/et.po | 6 +- heremaps-uc/resources/po/eu.po | 6 +- heremaps-uc/resources/po/fi.po | 6 +- heremaps-uc/resources/po/fr.po | 6 +- heremaps-uc/resources/po/fr_CA.po | 6 +- heremaps-uc/resources/po/ga.po | 6 +- heremaps-uc/resources/po/gl.po | 6 +- heremaps-uc/resources/po/hi.po | 6 +- heremaps-uc/resources/po/hr.po | 6 +- heremaps-uc/resources/po/hu.po | 6 +- heremaps-uc/resources/po/hy.po | 6 +- heremaps-uc/resources/po/is.po | 6 +- heremaps-uc/resources/po/it.po | 6 +- heremaps-uc/resources/po/it_IT.po | 6 +- heremaps-uc/resources/po/ja.po | 7 +- heremaps-uc/resources/po/ja_JP.po | 6 +- heremaps-uc/resources/po/ka.po | 6 +- heremaps-uc/resources/po/kk.po | 6 +- heremaps-uc/resources/po/ko.po | 6 +- heremaps-uc/resources/po/ko_KR.po | 6 +- heremaps-uc/resources/po/lt.po | 6 +- heremaps-uc/resources/po/lv.po | 6 +- heremaps-uc/resources/po/mk.po | 6 +- heremaps-uc/resources/po/nb.po | 6 +- heremaps-uc/resources/po/nl.po | 6 +- heremaps-uc/resources/po/pl.po | 6 +- heremaps-uc/resources/po/pt.po | 6 +- heremaps-uc/resources/po/pt_BR.po | 6 +- heremaps-uc/resources/po/pt_PT.po | 6 +- heremaps-uc/resources/po/ro.po | 6 +- heremaps-uc/resources/po/ru.po | 6 +- heremaps-uc/resources/po/ru_RU.po | 6 +- heremaps-uc/resources/po/sk.po | 6 +- heremaps-uc/resources/po/sl.po | 6 +- heremaps-uc/resources/po/sr.po | 6 +- heremaps-uc/resources/po/sv.po | 6 +- heremaps-uc/resources/po/tr.po | 6 +- heremaps-uc/resources/po/tr_TR.po | 6 +- heremaps-uc/resources/po/uk.po | 6 +- heremaps-uc/resources/po/uz.po | 6 +- heremaps-uc/resources/po/zh_CN.po | 6 +- heremaps-uc/resources/po/zh_HK.po | 6 +- heremaps-uc/resources/po/zh_SG.po | 6 +- heremaps-uc/resources/po/zh_TW.po | 6 +- heremaps-uc/src/heremaps-uc.c | 90 +++++++- packaging/maps-plugin-here.spec | 8 + src/heremaps-check-uc.cpp | 4 +- 72 files changed, 544 insertions(+), 185 deletions(-) create mode 100644 heremaps-uc/resources/edje/CMakeLists.txt create mode 100644 heremaps-uc/resources/edje/heremaps-uc.edc create mode 100644 heremaps-uc/resources/edje/macros.edc create mode 100644 heremaps-uc/resources/images/tw_ic_popup_btn_check.png create mode 100644 heremaps-uc/resources/images/tw_ic_popup_btn_delete.png diff --git a/CMakeLists.txt b/CMakeLists.txt index df04eae..861afa1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,6 +22,8 @@ SET(dependents ecore-evas elementary vconf + efl-extension + edje ) INCLUDE(FindPkgConfig) @@ -31,7 +33,6 @@ FOREACH(flag ${pkgs_CFLAGS}) SET(EXTRA_CXXFLAGS "${EXTRA_CFLAGS} ${flag}") ENDFOREACH(flag) - # Build SET(CMAKE_INSTALL_PREFIX /usr) SET(PREFIX ${CMAKE_INSTALL_PREFIX}) diff --git a/heremaps-uc/CMakeLists.txt b/heremaps-uc/CMakeLists.txt index 72e7e17..6261d20 100644 --- a/heremaps-uc/CMakeLists.txt +++ b/heremaps-uc/CMakeLists.txt @@ -20,12 +20,19 @@ SET(BINDIR "${HERE_PREFIX}/bin") SET(LIBDIR "${HERE_PREFIX}/lib") SET(RESDIR "${HERE_PREFIX}/res") SET(LOCALE_DIR "${RESDIR}/locale") +SET(IMGDIR "${RESDIR}/images") +SET(EDJ_DIR "${RESDIR}/edje") IF("${CMAKE_BUILD_TYPE}" STREQUAL "") SET(CMAKE_BUILD_TYPE "Release") ENDIF("${CMAKE_BUILD_TYPE}" STREQUAL "") MESSAGE("Build type: ${CMAKE_BUILD_TYPE}") +IF(TIZEN_WEARABLE) + MESSAGE(TIZEN_WEARABLE) + ADD_DEFINITIONS("-DTIZEN_WEARABLE") +ENDIF(TIZEN_WEARABLE) + INCLUDE(FindPkgConfig) # Check external libraries @@ -40,8 +47,11 @@ ENDFOREACH(flag) SET(CMAKE_C_FLAGS "${COMMON_C_FLAGS} ${EXTRA_CFLAGS}") ADD_DEFINITIONS("-DHEREMAPS_UC_PKG=\"${PKG_NAME}\"") +ADD_DEFINITIONS("-DPROJECT_NAME=\"${PROJECT_NAME}\"") ADD_DEFINITIONS("-DRES_DIR=\"${RESDIR}\"") ADD_DEFINITIONS("-DLOCALE_DIR=\"${LOCALE_DIR}\"") +ADD_DEFINITIONS("-DEDJ_DIR=\"${EDJ_DIR}\"") ADD_SUBDIRECTORY(src) ADD_SUBDIRECTORY(resources/po) +ADD_SUBDIRECTORY(resources/edje) diff --git a/heremaps-uc/org.tizen.heremaps-uc.xml b/heremaps-uc/org.tizen.heremaps-uc.xml index 6f5d925..18c4af6 100644 --- a/heremaps-uc/org.tizen.heremaps-uc.xml +++ b/heremaps-uc/org.tizen.heremaps-uc.xml @@ -1,5 +1,5 @@ - + Seechan Kim JongMun Woo diff --git a/heremaps-uc/resources/edje/CMakeLists.txt b/heremaps-uc/resources/edje/CMakeLists.txt new file mode 100644 index 0000000..9087102 --- /dev/null +++ b/heremaps-uc/resources/edje/CMakeLists.txt @@ -0,0 +1,12 @@ +CMAKE_MINIMUM_REQUIRED(VERSION 2.6) +PROJECT(heremaps-uc C) + +ADD_CUSTOM_TARGET(heremaps-uc.edj + COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/../images + ${CMAKE_CURRENT_SOURCE_DIR}/heremaps-uc.edc ${CMAKE_CURRENT_SOURCE_DIR}/heremaps-uc.edj + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/heremaps-uc.edc +) +ADD_DEPENDENCIES(${PROJECT_NAME} heremaps-uc.edj) + +#install binary & edj files +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/heremaps-uc.edj DESTINATION ${EDJ_DIR}) diff --git a/heremaps-uc/resources/edje/heremaps-uc.edc b/heremaps-uc/resources/edje/heremaps-uc.edc new file mode 100644 index 0000000..837d883 --- /dev/null +++ b/heremaps-uc/resources/edje/heremaps-uc.edc @@ -0,0 +1,8 @@ +#include "macros.edc" + +collections { + base_scale: 1.3; + + RESOURCE_IMAGE_SIZE("tw_ic_popup_btn_check.png", 50, 50) + RESOURCE_IMAGE_SIZE("tw_ic_popup_btn_delete.png", 50, 50) +} diff --git a/heremaps-uc/resources/edje/macros.edc b/heremaps-uc/resources/edje/macros.edc new file mode 100644 index 0000000..ff53bc7 --- /dev/null +++ b/heremaps-uc/resources/edje/macros.edc @@ -0,0 +1,229 @@ +#define PADDING_PART( PADDING_NAME , PADDING_VALUE ) \ + part { \ + name: PADDING_NAME; \ + scale: 1; \ + type: SPACER; \ + description { \ + state: "default" 0.0; \ + rel1.relative: 0.0 0.0; \ + rel2.relative: 1.0 0.0; \ + align: 0.5 0.0; \ + fixed: 0 1; \ + min: 0 PADDING_VALUE; \ + max: -1 PADDING_VALUE; \ + } \ + } + +#define RESOURCE_IMAGE_CODE_PRESS_SIZE( FILE_NAME , DEFAULT_COLOR_CODE, PRESSED_COLOR_CODE, FILE_SIZE_W, FILE_SIZE_H ) \ + group { \ + name: FILE_NAME; \ + images.image: FILE_NAME COMP; \ + parts { \ + part { \ + name: "image"; \ + repeat_events: 1; \ + description { \ + state: "default" 0.0; \ + image.normal: FILE_NAME; \ + color_class: DEFAULT_COLOR_CODE;\ + aspect: 1 1; \ + fixed: 1 1; \ + min: FILE_SIZE_W FILE_SIZE_H; \ + max: FILE_SIZE_W FILE_SIZE_H; \ + aspect_preference: BOTH; \ + } \ + description { \ + state: "pressed" 0.0; \ + inherit: "default" 0.0; \ + color_class: PRESSED_COLOR_CODE;\ + } \ + }\ + }\ + programs{\ + program {\ + name: "mouse.down";\ + source: "image";\ + signal: "mouse,down,*";\ + action: STATE_SET "pressed" 0.0;\ + target: "image";\ + }\ + program {\ + name: "mouse.up";\ + source: "image";\ + signal: "mouse,up,*";\ + action: STATE_SET "default" 0.0;\ + target: "image";\ + }\ + }\ + } + + +#define RESOURCE_IMAGE_AND_PRESS( FILE_NAME , DEFAULT_COLOR_CODE, PRESSED_COLOR_CODE ) \ + group { \ + name: FILE_NAME; \ + images.image: FILE_NAME COMP; \ + parts { \ + part { \ + name: "image"; \ + repeat_events: 1; \ + description { \ + state: "default" 0.0; \ + image.normal: FILE_NAME; \ + color_class: DEFAULT_COLOR_CODE;\ + aspect: 1 1; \ + aspect_preference: BOTH; \ + } \ + description { \ + state: "pressed" 0.0; \ + inherit: "default" 0.0;\ + color_class: PRESSED_COLOR_CODE;\ + } \ + }\ + }\ + programs{\ + program {\ + name: "mouse.down";\ + source: "image";\ + signal: "mouse,down,*";\ + action: STATE_SET "pressed" 0.0;\ + target: "image";\ + }\ + program {\ + name: "mouse.up";\ + source: "image";\ + signal: "mouse,up,*";\ + action: STATE_SET "default" 0.0;\ + target: "image";\ + }\ + }\ + } + +#define RESOURCE_IMAGE_AND_PRESS_WITHOUT_COLOR( FILE_NAME ) \ + group { \ + name: FILE_NAME; \ + images.image: FILE_NAME COMP; \ + parts { \ + part { \ + name: "image"; \ + repeat_events: 1; \ + description { \ + state: "default" 0.0; \ + image.normal: FILE_NAME; \ + aspect: 1 1; \ + aspect_preference: BOTH; \ + } \ + description { \ + state: "pressed" 0.0; \ + inherit: "default" 0.0;\ + } \ + }\ + }\ + programs{\ + program {\ + name: "mouse.down";\ + source: "image";\ + signal: "mouse,down,*";\ + action: STATE_SET "pressed" 0.0;\ + target: "image";\ + }\ + program {\ + name: "mouse.up";\ + source: "image";\ + signal: "mouse,up,*";\ + action: STATE_SET "default" 0.0;\ + target: "image";\ + }\ + }\ + } + +#define RESOURCE_IMAGE( FILE_NAME ) \ + group { \ + name: FILE_NAME; \ + images.image: FILE_NAME COMP; \ + parts { \ + part { name: "image"; \ + description { \ + state: "default" 0.0; \ + image.normal: FILE_NAME; \ + aspect: 1 1; \ + aspect_preference: BOTH; \ + } \ + } \ + } \ + } + +#define RESOURCE_IMAGE_COLOR_SIZE( FILE_NAME, COLOR_CLASS , FILE_SIZE_W, FILE_SIZE_H) \ + group { \ + name: FILE_NAME; \ + images.image: FILE_NAME COMP; \ + parts { \ + part { name: "image"; \ + description { \ + state: "default" 0.0; \ + fixed: 1 1; \ + align: 0.5 0.5; \ + min: FILE_SIZE_W FILE_SIZE_H; \ + max: FILE_SIZE_W FILE_SIZE_H; \ + image.normal: FILE_NAME; \ + color_class: COLOR_CLASS; \ + } \ + } \ + } \ + } + +#define RESOURCE_IMAGE_SIZE( FILE_NAME, FILE_SIZE_W, FILE_SIZE_H) \ + group { \ + name: FILE_NAME; \ + images.image: FILE_NAME COMP; \ + parts { \ + part { name: "image"; \ + description { \ + state: "default" 0.0; \ + fixed: 1 1; \ + min: FILE_SIZE_W FILE_SIZE_H; \ + max: FILE_SIZE_W FILE_SIZE_H; \ + image.normal: FILE_NAME; \ + } \ + } \ + } \ + } + +#define RESOURCE_MAP_PIN( FILE_NAME, FILE_SIZE_W, FILE_SIZE_H, OFFSET_H ) \ + group { \ + name: FILE_NAME; \ + images.image: FILE_NAME COMP; \ + parts { \ + part { name: "image"; \ + description { \ + state: "default" 0.0; \ + fixed: 1 1; \ + align: 0.0 0.0; \ + min: FILE_SIZE_W FILE_SIZE_H; \ + max: FILE_SIZE_W FILE_SIZE_H; \ + image.normal: FILE_NAME; \ + rel1 { offset: -FILE_SIZE_W/2 -OFFSET_H; } \ + rel2 { offset: -FILE_SIZE_W/2 -OFFSET_H; } \ + } \ + } \ + } \ + } + +#define RESOURCE_MAP_OVERAY( FILE_NAME, FILE_SIZE_W, FILE_SIZE_H) \ + group { \ + name: FILE_NAME; \ + images.image: FILE_NAME COMP; \ + parts { \ + part { name: "image"; \ + description { \ + state: "default" 0.0; \ + fixed: 1 1; \ + align: 0.0 0.0; \ + min: FILE_SIZE_W FILE_SIZE_H; \ + max: FILE_SIZE_W FILE_SIZE_H; \ + image.normal: FILE_NAME; \ + rel1 { offset: -FILE_SIZE_W/2 -FILE_SIZE_H/2; } \ + rel2 { offset: -FILE_SIZE_W/2 -FILE_SIZE_H/2; } \ + } \ + } \ + } \ + } diff --git a/heremaps-uc/resources/images/tw_ic_popup_btn_check.png b/heremaps-uc/resources/images/tw_ic_popup_btn_check.png new file mode 100644 index 0000000000000000000000000000000000000000..3dce121f149a712e08bb120b9fbcba6dc6c392d0 GIT binary patch literal 1331 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2nC-$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s00+w{G(#^lGsVi;%)-dj(Z#~a&CuM?(AC7z+|1I|*~GxY z(ACt;%+(2|*Cju>G&eP`1g19yq1O_pUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dZnv1> zG!Lpb1-Dzwaq86vIz}H9wMbD769T3m5EGtofgE_!Pt60S_ab1z&fjl7kAZ=4si%u$ zNX4x;H_xXtJBqM>Sh6yp>h0Dke^hP1Udh&6I%U!c%{Q7YLZ{|=X)J7+S_fNk&GyCs}e>3i0X%*P2wPkOVtCX|EA%Ql77DXOS z!6z%YCYYsgTDn%BbWJ|=vTOggwmB<*E$caP#`U$HvUPi+bB9=pSX-XOPTdxM}6eTZIfiUDS3LI`~Z3#lNj| z<6I$QceTBybJjR26ittx`AWf1{=}15<|862i{Dr6dQ~!MMmalAtHiGzl`qPscsH9r zNvJxpL((Yk!E3#YOObL{w2J~}DlU5ed1i{0!}kY17cVMW&9Htn>s4#Ss~dbv^b)S` zjxp)rT_#(^`ZlVe>cmYuo5jv6Qrq9RrWJTxbTW`qIA&h(iad!N;NV+w-HeHcVYN3$%G!;GuYrm&Pgg&ebxsLQ0Hu@OaR2}S literal 0 HcmV?d00001 diff --git a/heremaps-uc/resources/images/tw_ic_popup_btn_delete.png b/heremaps-uc/resources/images/tw_ic_popup_btn_delete.png new file mode 100644 index 0000000000000000000000000000000000000000..58de36c9192d1dc72e3689fd31d3338faa624cff GIT binary patch literal 1457 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=1|;R|J2nC-$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s00+w{G(#^lGsVi;%)-dj(Z$)x&CuM?(AC7z+|1I|*~GxY z(ACt;%+(2|*Cju>G&eP`1g19yq1OecUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dZnrq% zG!Lpb1-DzAaO%|uIz}H9wMbD769T3m5EGtofgE_!Pt60S_ab1zel}6*Cj$eMvZsq< zNX4x;H!r$72gC`a8Gy-QT%)Z(G^#^S`_KT>9?a&*$7f)U)w|%@wB%KQCt! z7ZCc#qQd^tA*kzlX#15VZW7wN6FyB~{Jly}Mb|J)t@K-L^`gfq0?ywyzY|H|yYc?k z@+KFB@SLi<&PFT^9n6PTDP2{c)cQsCpXYt$w)Pc)_o9?$tnogg*mPs*zrKi*Gqzve zQZ?a7LI=NOi*yHvntF$Yn}GGE&qdYo%g-*qwneJIp!*7kz5w@SXM;+1m&1u?q?bG@ zvx}3Tt;v$S#=4dBNGBHy>yblulx8gIv~U%Oj(hI7RVjIfx`(^!A&(gwx+k@4QDi;% z`uK$06Ok9Tee9oLdgALELAO@XFI$D4sRz3V%%1Rhf&7|#itFd>?{BVi>T!;mu<3y5 z(gjXEoMx=*62c6>nGW82y74fxLfWBB1D5k2Se{%;oGalNrcii-^|@5MxC_rmCe7RH zdJ7F!*Evo)Ay^@lc)TPuAw*%GqH0Rcl;+6!qDLI=D0HMYUhh!)tsgG&>g>ZwN3tbn zm~EPQCxCUK%MC-_uDOOsGYd2>l|M?D6=ztd>|!X&<-zXwg!A^&8=6H&vYB?}p5g5f zysiIPV&0d5{buU99PxNx%t&UUuuye5dG)>qG0Qk T^Uv(91Qnv5u6{1-oD!Mconformant = create_conformant(ad->win_main); ad->layout_main = create_layout(ad->conformant); +#ifdef TIZEN_WEARABLE + ad->popup = create_popup_wearable(ad->layout_main, ad); +#else ad->popup = create_popup(ad->layout_main, ad); +#endif evas_object_show(ad->win_main); LS_FUNC_EXIT diff --git a/packaging/maps-plugin-here.spec b/packaging/maps-plugin-here.spec index 28cfc56..c258e1d 100644 --- a/packaging/maps-plugin-here.spec +++ b/packaging/maps-plugin-here.spec @@ -27,7 +27,10 @@ BuildRequires: pkgconfig(vconf) BuildRequires: pkgconfig(appcore-efl) BuildRequires: pkgconfig(ecore) BuildRequires: pkgconfig(evas) +BuildRequires: pkgconfig(efl-extension) +BuildRequires: pkgconfig(edje) BuildRequires: gettext-tools +BuildRequires: edje-bin # for here engine BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(json-c) @@ -66,7 +69,11 @@ This package provides Plugin APIs capsulating HERE Maps Engine Library for Maps %build MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` +%if "%{profile}" == "wearable" +cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DMAJORVER=${MAJORVER} -DFULLVER=%{version} -DLIBDIR=lib -DARCH=%{ARCH} -DSYSCONF_DIR=%{_sysconfdir} -DTIZEN_WEARABLE=YES +%else cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DMAJORVER=${MAJORVER} -DFULLVER=%{version} -DLIBDIR=lib -DARCH=%{ARCH} -DSYSCONF_DIR=%{_sysconfdir} +%endif make %{?jobs:-j%jobs} %install @@ -103,6 +110,7 @@ This package provides UI interface to get consents from users to the HERE platfo %defattr(-,root,root,-) /usr/apps/org.tizen.heremaps-uc/bin/* /usr/apps/org.tizen.heremaps-uc/res/locale +/usr/apps/org.tizen.heremaps-uc/res/edje/*.edj /usr/share/packages/org.tizen.heremaps-uc.xml diff --git a/src/heremaps-check-uc.cpp b/src/heremaps-check-uc.cpp index 569662a..f3f6040 100644 --- a/src/heremaps-check-uc.cpp +++ b/src/heremaps-check-uc.cpp @@ -38,7 +38,7 @@ bool heremaps_check_agreement() ret = vconf_get_int(VCONFKEY_LOCATION_HEREMAPS_CONSENT, &enabled); MAPS_LOGD("VCONFKEY_LOCATION_HEREMAPS_CONSENT is %d", enabled); - if (ret != 0 || enabled == 0) { + if (ret != 0 || enabled != 1) { if (ret != 0) MAPS_LOGD("Fail to get vconf value"); @@ -58,7 +58,7 @@ bool heremaps_check_agreement() if (strAppId != NULL) g_free(strAppId); - if (enabled == 0) + if (enabled != 1) return FALSE; else return TRUE; -- 2.7.4