diff options
| author | moon87.park <moon87.park@samsung.com> | 2017-06-12 21:32:03 +0900 |
|---|---|---|
| committer | moon87.park <moon87.park@samsung.com> | 2017-06-13 17:27:17 +0900 |
| commit | dc1ad6fefd5fa47b96445232f01223ae629b9d97 (patch) | |
| tree | baf1531e6ab0fea6ce8336a1d60db8ad1fce0b63 | |
| parent | c87228fc6633052d3c186d8d488bbd7a1b807ecd (diff) | |
| download | w-clock-viewer-dc1ad6fefd5fa47b96445232f01223ae629b9d97.tar.gz w-clock-viewer-dc1ad6fefd5fa47b96445232f01223ae629b9d97.tar.bz2 w-clock-viewer-dc1ad6fefd5fa47b96445232f01223ae629b9d97.zip | |
[Clock-viewer] Reset the clock resource id when clock is relaunchedtizen_4.0.IoT.p1_releasesubmit/tizen_4.0_unified/20170814.115522submit/tizen_4.0/20170828.100009submit/tizen_4.0/20170814.115522submit/tizen_4.0/20170811.094300submit/tizen/20170619.074952submit/tizen/20170614.054504accepted/tizen/unified/20170630.083143accepted/tizen/4.0/unified/20170828.223050accepted/tizen/4.0/unified/20170816.014128
Change-Id: I1d077b8175e0188a7bbbe44b1c639b99e652e763
| -rw-r--r-- | clock-viewer/org.tizen.w-clock-viewer.xml.in | 1 | ||||
| -rw-r--r-- | clock-viewer/src/clock-viewer.c | 7 |
2 files changed, 4 insertions, 4 deletions
diff --git a/clock-viewer/org.tizen.w-clock-viewer.xml.in b/clock-viewer/org.tizen.w-clock-viewer.xml.in index 6c9fc50..922b220 100644 --- a/clock-viewer/org.tizen.w-clock-viewer.xml.in +++ b/clock-viewer/org.tizen.w-clock-viewer.xml.in @@ -13,5 +13,6 @@ <privilege>http://tizen.org/privilege/display</privilege> <privilege>http://tizen.org/privilege/appmanager.launch</privilege> <privilege>http://tizen.org/privilege/appmanager.kill</privilege> + <privilege>http://tizen.org/privilege/widget.viewer</privilege> </privileges> </manifest> diff --git a/clock-viewer/src/clock-viewer.c b/clock-viewer/src/clock-viewer.c index 5eab223..ad044d6 100644 --- a/clock-viewer/src/clock-viewer.c +++ b/clock-viewer/src/clock-viewer.c @@ -394,8 +394,10 @@ static void _clock_viewer_set_current_clock(clock_viewer_s *clock_viewer) return; } + resource_id = clock_viewer_util_pkginfo_get_clock_resource_id(); + if (s_info.clock_pkgname) { - if (!strcmp(s_info.clock_pkgname, pkgname) && s_info.resource_id) { + if (!strcmp(s_info.clock_pkgname, pkgname) && s_info.resource_id == resource_id) { _WARN("same pkgname(%s), skip!", pkgname); free(pkgname); return; @@ -404,7 +406,6 @@ static void _clock_viewer_set_current_clock(clock_viewer_s *clock_viewer) _DBG("First time\n"); } - resource_id = clock_viewer_util_pkginfo_get_clock_resource_id(); if (!resource_id) { _ERR("resource id is not valid\n"); ambient_type = CLOCK_VIEWER_AMBIENT_TYPE_ANALOG; @@ -545,7 +546,6 @@ HAPI void clock_viewer_show(clock_viewer_s *clock_viewer, int is_hide_launch) s_info.is_clock_resumed = 1; } else { - evas_object_move(win, clock_viewer->win_width - 1, clock_viewer->win_height - 1); evas_object_show(win); } @@ -568,7 +568,6 @@ HAPI void clock_viewer_show(clock_viewer_s *clock_viewer, int is_hide_launch) evas_object_resize(win, clock_viewer->win_width, clock_viewer->win_height); evas_object_show(win); } else { - evas_object_move(win, clock_viewer->win_width - 1, clock_viewer->win_height - 1); evas_object_show(win); } |