diff options
| author | Jihoon Kim <jihoon48.kim@samsung.com> | 2020-10-29 15:17:54 +0900 |
|---|---|---|
| committer | Jihoon Kim <jihoon48.kim@samsung.com> | 2020-10-29 15:18:01 +0900 |
| commit | 9551d59be9f0d07ddf8fa378479da95e4233bb77 (patch) | |
| tree | d58cbf4c8cb2d62cbac045c4bd6e6fe3122c1360 | |
| parent | 21106707cbc4c00723bc24860f07668c1921740b (diff) | |
| parent | 2cdbce3d20cedfce31122ecb82dcbec9e53eff52 (diff) | |
| download | autofill-setting-tizen_6.0.tar.gz autofill-setting-tizen_6.0.tar.bz2 autofill-setting-tizen_6.0.zip | |
Merge branch 'tizen' into tizen_6.0submit/tizen_6.0/20201103.024036accepted/tizen/6.0/unified/20201109.024710tizen_6.0accepted/tizen_6.0_unified
Change-Id: I59e75652138173d13f850e84a66f6d8953503554
| -rw-r--r-- | org.tizen.autofill-setting-wearable.xml | 2 | ||||
| -rw-r--r-- | packaging/org.tizen.autofill-setting-wearable.spec | 2 | ||||
| -rw-r--r-- | src/autofill_setting_list_ui.cpp | 25 |
3 files changed, 6 insertions, 23 deletions
diff --git a/org.tizen.autofill-setting-wearable.xml b/org.tizen.autofill-setting-wearable.xml index 624c23b..ceb55af 100644 --- a/org.tizen.autofill-setting-wearable.xml +++ b/org.tizen.autofill-setting-wearable.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<manifest xmlns="http://tizen.org/ns/packages" api-version="5.5" package="org.tizen.autofill-setting-wearable" version="0.1.11" install-location="internal-only"> +<manifest xmlns="http://tizen.org/ns/packages" api-version="5.5" package="org.tizen.autofill-setting-wearable" version="0.1.13" install-location="internal-only"> <label>Autofill setting</label> <author email="jihoon48.kim@samsung.com" href="www.samsung.com">Jihoon Kim</author> <description>Autofill setting application</description> diff --git a/packaging/org.tizen.autofill-setting-wearable.spec b/packaging/org.tizen.autofill-setting-wearable.spec index 5c64634..04c4db1 100644 --- a/packaging/org.tizen.autofill-setting-wearable.spec +++ b/packaging/org.tizen.autofill-setting-wearable.spec @@ -1,6 +1,6 @@ Name: org.tizen.autofill-setting-wearable Summary: Autofill Setting Application -Version: 0.1.11 +Version: 0.1.13 Release: 1 Group: Graphics & UI Framework/Input License: Apache-2.0 diff --git a/src/autofill_setting_list_ui.cpp b/src/autofill_setting_list_ui.cpp index 2881412..7531750 100644 --- a/src/autofill_setting_list_ui.cpp +++ b/src/autofill_setting_list_ui.cpp @@ -353,19 +353,6 @@ static void autofill_setting_list_item_sel_cb(void *data, Evas_Object *obj, void } } -static void -_elm_win_resize_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) -{ - Evas_Coord w = -1, h = -1; - Evas_Object *conform = (Evas_Object*)data; - if (conform) { - evas_object_geometry_get(obj, NULL, NULL, &w, &h); - if (w > 0 && h > 0) { - evas_object_resize(conform, w, h); - } - } -} - static Evas_Object *autofill_setting_list_conform_create(Evas_Object *parentWin) { Evas_Object *conform = elm_conformant_add(parentWin); @@ -379,13 +366,9 @@ static Evas_Object *autofill_setting_list_conform_create(Evas_Object *parentWin) elm_object_part_content_set(conform, "elm.swallow.indicator_bg", bg); evas_object_show(bg); - Evas_Coord w = -1, h = -1; - elm_win_screen_size_get(parentWin, NULL, NULL, &w, &h); - if (w > 0 && h > 0) { - evas_object_resize(conform, w, h); - } - evas_object_event_callback_add(parentWin, EVAS_CALLBACK_RESIZE, _elm_win_resize_cb, conform); + elm_win_resize_object_add(parentWin, conform); evas_object_show(conform); + return conform; } @@ -708,8 +691,7 @@ static void manager_connection_status_changed_cb(autofill_manager_h g_amh, autof switch (status) { case AUTOFILL_MANAGER_CONNECTION_STATUS_CONNECTED: LOGD("connected"); - autofill_setting_list_load_autofill_info(); - autofill_setting_list_list_create(ad); + autofill_setting_list_update_window(ad); break; case AUTOFILL_MANAGER_CONNECTION_STATUS_DISCONNECTED: LOGD("disconnected"); @@ -763,6 +745,7 @@ autofill_setting_list_app_create(void *data) } } + autofill_setting_list_list_create(ad); evas_object_show(ad->win); } |