Fixed Opt-out button ux

Change-Id: If44a35ef0866805a1d37f45439a01cddca057e60
Signed-off-by: Younho Park <younho.park@samsung.com>

diff --git a/packaging/adid.spec b/packaging/adid.spec
deleted file mode 100644 (file)
index f29adc0..0000000
--- a/packaging/adid.spec
+++ /dev/null
@@ -1,83 +0,0 @@
-Name:       org.tizen.settings-adid
-Summary:    Ad Id
-Version:    0.0.1
-Release:    1
-Group:      comm
-License:    Apache-2.0
-Source0:    %{name}-%{version}.tar.gz
-BuildRequires: pkgconfig(capi-appfw-application)
-BuildRequires: pkgconfig(efl-extension)
-BuildRequires: pkgconfig(cairo)
-BuildRequires: pkgconfig(elementary)
-BuildRequires: pkgconfig(eina)
-BuildRequires: pkgconfig(evas)
-BuildRequires: pkgconfig(edje)
-BuildRequires: pkgconfig(dlog)
-BuildRequires: pkgconfig(vconf)
-BuildRequires: pkgconfig(appcore-efl)
-BuildRequires: pkgconfig(capi-system-system-settings)
-BuildRequires: edje-bin
-BuildRequires: cmake
-BuildRequires: gettext-tools
-Requires(post):   /sbin/ldconfig
-Requires(post):   /usr/bin/vconftool
-requires(postun): /sbin/ldconfig
-
-%define appdir /usr/apps/org.tizen.settings-adid
-
-%description
-Tizen Ad-Id Setting Application
-
-%prep
-%setup -q
-
-%build
-export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE"
-export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE"
-export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
-
-%define PREFIX    "/usr/apps/org.tizen.settings-adid"
-%define RW_PREFIX      "/opt/usr/apps/org.tizen.settings-adid"
-
-cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX} -DCMAKE_INSTALL_RW_PREFIX=%{RW_PREFIX}
-cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX} -DCMAKE_INSTALL_DATADIR=%{DATADIR}
-cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX} -DCMAKE_INSTALL_SHAREDDIR=%{SHAREDDIR}
-make %{?jobs:-j%jobs}
-
-
-%install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}/usr/share/license
-cp %{_builddir}/%{name}-%{version}/LICENSE.APLv2 %{buildroot}/usr/share/license/%{name}
-
-%make_install
-
-###### for package signing step ######
-%define tizen_sign 1
-%define tizen_sign_base /usr/apps/org.tizen.settings-adid
-%define tizen_sign_level platform
-%define tizen_author_sign 1
-%define tizen_dist_sign 1
-
-%post
-/sbin/ldconfig
-mkdir -p /opt/usr/apps/org.tizen.settings-adid/data
-chown -R 5000:5000 /opt/usr/apps/org.tizen.settings-adid/data
-echo -e '\033[1m\033[36m ===== Import to package DB using tpk-backend ===== \033[0m'
-echo 'tpk-backend -y %{name} --preload'
-tpk-backend -y %{name} --preload
-echo -e '\033[1m\033[36m ===== done ===== \033[0m'
-
-%postun -p /sbin/ldconfig
-
-%files
-%manifest org.tizen.settings-adid.manifest
-%defattr(-,root,root,-)
-/usr/share/license/%{name}
-%attr(-,inhouse,inhouse)
-/usr/apps/org.tizen.settings-adid/*
-%defattr(-,root,root,-)
-%{appdir}/data/
-/usr/share/packages/org.tizen.settings-adid.xml
-%defattr(-,*,*,-)
-%dir

diff --git a/packaging/org.tizen.settings-adid.spec b/packaging/org.tizen.settings-adid.spec
new file mode 100644 (file)
index 0000000..2d986ac
--- /dev/null
+++ b/packaging/org.tizen.settings-adid.spec
@@ -0,0 +1,83 @@
+Name:       org.tizen.settings-adid
+Summary:    Ad Id
+Version:    0.0.1
+Release:    1
+Group:      Network & Connectivity/Service
+License:    Apache-2.0
+Source0:    %{name}-%{version}.tar.gz
+BuildRequires: pkgconfig(capi-appfw-application)
+BuildRequires: pkgconfig(efl-extension)
+BuildRequires: pkgconfig(cairo)
+BuildRequires: pkgconfig(elementary)
+BuildRequires: pkgconfig(eina)
+BuildRequires: pkgconfig(evas)
+BuildRequires: pkgconfig(edje)
+BuildRequires: pkgconfig(dlog)
+BuildRequires: pkgconfig(vconf)
+BuildRequires: pkgconfig(appcore-efl)
+BuildRequires: pkgconfig(capi-system-system-settings)
+BuildRequires: edje-bin
+BuildRequires: cmake
+BuildRequires: gettext-tools
+Requires(post):   /sbin/ldconfig
+Requires(post):   /usr/bin/vconftool
+requires(postun): /sbin/ldconfig
+
+%define appdir /usr/apps/org.tizen.settings-adid
+
+%description
+Tizen Ad-Id Setting Application
+
+%prep
+%setup -q
+
+%build
+export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE"
+export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE"
+export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
+
+%define PREFIX    "/usr/apps/org.tizen.settings-adid"
+%define RW_PREFIX      "/opt/usr/apps/org.tizen.settings-adid"
+
+cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX} -DCMAKE_INSTALL_RW_PREFIX=%{RW_PREFIX}
+cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX} -DCMAKE_INSTALL_DATADIR=%{DATADIR}
+cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX} -DCMAKE_INSTALL_SHAREDDIR=%{SHAREDDIR}
+make %{?jobs:-j%jobs}
+
+
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}/usr/share/license
+cp %{_builddir}/%{name}-%{version}/LICENSE.APLv2 %{buildroot}/usr/share/license/%{name}
+
+%make_install
+
+###### for package signing step ######
+%define tizen_sign 1
+%define tizen_sign_base /usr/apps/org.tizen.settings-adid
+%define tizen_sign_level platform
+%define tizen_author_sign 1
+%define tizen_dist_sign 1
+
+%post
+/sbin/ldconfig
+mkdir -p /opt/usr/apps/org.tizen.settings-adid/data
+chown -R 5000:5000 /opt/usr/apps/org.tizen.settings-adid/data
+echo -e '\033[1m\033[36m ===== Import to package DB using tpk-backend ===== \033[0m'
+echo 'tpk-backend -y %{name} --preload'
+tpk-backend -y %{name} --preload
+echo -e '\033[1m\033[36m ===== done ===== \033[0m'
+
+%postun -p /sbin/ldconfig
+
+%files
+%manifest org.tizen.settings-adid.manifest
+%defattr(-,root,root,-)
+/usr/share/license/%{name}
+%attr(-,inhouse,inhouse)
+/usr/apps/org.tizen.settings-adid/*
+%defattr(-,root,root,-)
+%{appdir}/data/
+/usr/share/packages/org.tizen.settings-adid.xml
+%defattr(-,*,*,-)
+%dir

diff --git a/src/ad-id.c b/src/ad-id.c
index 9fcc24082d127f0b2bf79589d20e40a444aa7059..02023b898aa24ce0f33eaf2d8e341165814f4241 100644 (file)
--- a/src/ad-id.c
+++ b/src/ad-id.c
@@ -29,6 +29,7 @@
 #define DEFAULT_ID "00000000-0000-0000-0000-000000000000"
 
 Elm_Object_Item *id_it = NULL;
+Elm_Object_Item *id_it2 = NULL;
 
 const char *get_res_path()
 {
@@ -76,10 +77,11 @@ static void
 _opt_out_popup_ok_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 {
        Evas_Object *popup = data;
-
        Evas_Object *chk = (Evas_Object *)evas_object_data_get(popup, "checkobj");
        evas_object_del(popup);
        bool val = elm_check_state_get(chk);
+
+       AI_FUNC_ENTER
        val = !val;
        elm_check_state_set(chk, val);
        elm_object_item_disabled_set(id_it, val);
@@ -87,6 +89,9 @@ _opt_out_popup_ok_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
                vconf_set_int(VCONFKEY_SETAPPL_AD_ID_OPT_OUT, 1);
        else
                vconf_set_int(VCONFKEY_SETAPPL_AD_ID_OPT_OUT, 0);
+
+       elm_genlist_item_update(id_it2);
+
 }
 
 static void
@@ -230,12 +235,10 @@ static Evas_Object *
 _content_get_cb(void *data, Evas_Object *obj, const char *part)
 {
        AI_FUNC_ENTER
-       /* int id = (int) data; */
        int val = 0;
        vconf_get_int(VCONFKEY_SETAPPL_AD_ID_OPT_OUT, &val);
-       /* ad_id_app_data_s *ad = evas_object_data_get(obj, "ad"); */
 
-       if (!strcmp("elm.icon", part)) {
+       if (!strcmp("elm.swallow.icon", part)) {
                Evas_Object *check;
                check = elm_check_add(obj);
                elm_object_style_set(check, "on&off");
@@ -264,7 +267,7 @@ void sel_cb(void *data, Evas_Object *obj, void *event_info)
                _create_reset_id_popup(ad);
 
        } else if (id == 4) {
-               Evas_Object *chk = (Evas_Object *)elm_object_item_part_content_get(it, "elm.icon");
+               Evas_Object *chk = (Evas_Object *)elm_object_item_part_content_get(it, "elm.swallow.icon");
                if (!elm_check_state_get(chk))
                        _create_opt_out_popup(ad, chk);
                else {
@@ -343,9 +346,8 @@ create_list_view(ad_id_app_data_s *ad)
                sel_cb,         /* select smart callback */
                (void *)3);     /* smart callback user data */
 
-
-       elm_genlist_item_append(genlist,        /* genlist object */
-               itc2,           /* item class */
+       id_it2 = elm_genlist_item_append(genlist,       /* genlist object */
+               itc,            /* item class */
                (void *)4,      /* item class user data */
                NULL,
                ELM_GENLIST_ITEM_NONE,  /* item type */