[ABS] Merge branch 'tizen_4.0' into tizen

Conflicts:
	src/common/file-operation/mf-request.c
	src/common/file-system/mf-file-attr.c
	src/common/mf-callback.c
	src/common/mf-detail.c
	src/common/mf-file-util.c
	src/common/mf-fm-svc-wrapper.c
	src/common/mf-launch.c
	src/common/mf-media-content.c
	src/common/mf-otg.c
	src/common/mf-storage-space.c
	src/common/mf-ug-detail-fs.c
	src/common/mf-util.c
	src/media-db/mf-media-db.c
	src/media-db/mf-media.c
	src/mf-main.c
	src/thumbnail/mf-thumb-gen.c
	src/widget/mf-category-view.c
	src/widget/mf-detail-view.c
	src/widget/mf-edit-view.c
	src/widget/mf-gengrid.c
	src/widget/mf-genlist.c
	src/widget/mf-navi-bar.c
	src/widget/mf-object-item.c
	src/widget/mf-object.c
	src/widget/mf-popup.c
	src/widget/mf-root-view.c
	src/widget/mf-search-bar.c
	src/widget/mf-search-view.c
	src/widget/mf-tray-item.c
	src/widget/mf-view.c

Reference: submit/tizen/20180921.171241
Commit id: 02bb4aa37a100ed64cc7b1182212a8c5f5a504f7
Requested by: vikas.ag@samsung.com
SDK rootstrap version: 20180920_3

diff --git a/org.tizen.myfile-1.0.0-arm-debug.tpk b/org.tizen.myfile-1.0.0-arm-debug.tpk
index 27730d7867d3fdb8e9bc3262f2b872189642e5fd..3a5f312a75fd373cd805a16d5adf50340aef66b6 100644 (file)
Binary files a/org.tizen.myfile-1.0.0-arm-debug.tpk and b/org.tizen.myfile-1.0.0-arm-debug.tpk differ

diff --git a/org.tizen.myfile-1.0.0-arm.tpk b/org.tizen.myfile-1.0.0-arm.tpk
index 3f984fc552b5f06437cf3df7de11c486f83296ef..f15947dc739266bd2c450dd0ef26ed39b9f45ae9 100644 (file)
Binary files a/org.tizen.myfile-1.0.0-arm.tpk and b/org.tizen.myfile-1.0.0-arm.tpk differ

diff --git a/org.tizen.myfile-1.0.0-x86-debug.tpk b/org.tizen.myfile-1.0.0-x86-debug.tpk
index 119554a9c9d172ec29064b006cb7ef0336801f0e..ff3d17ae6fc9fe70eccefa915be2c40dbd216908 100644 (file)
Binary files a/org.tizen.myfile-1.0.0-x86-debug.tpk and b/org.tizen.myfile-1.0.0-x86-debug.tpk differ

diff --git a/org.tizen.myfile-1.0.0-x86.tpk b/org.tizen.myfile-1.0.0-x86.tpk
index bbf2fcedaac763dd4d9a53349b69a8a330ab8b02..9a9910dcc16dc0759d76f3ab640f05bd61579f32 100644 (file)
Binary files a/org.tizen.myfile-1.0.0-x86.tpk and b/org.tizen.myfile-1.0.0-x86.tpk differ

diff --git a/packaging/org.tizen.myfile.spec b/packaging/org.tizen.myfile.spec
index 7bf4025c7f5e1b35bbd4c15ca6d0383857695649..dead16a955ce90d7d1406f2d2a840e409251d8d3 100644 (file)
--- a/packaging/org.tizen.myfile.spec
+++ b/packaging/org.tizen.myfile.spec
@@ -1,6 +1,6 @@
 Name:       org.tizen.myfile
 #VCS_FROM:   profile/mobile/apps/native/myfiles#02bb4aa37a100ed64cc7b1182212a8c5f5a504f7
-#RS_Ver:    20180831_1
+#RS_Ver:    20180920_3
 Summary:    Myfile Application v1.0
 Version:    1.0.0
 Release:    1
@@ -34,7 +34,7 @@ Requires(post):  /usr/bin/tpk-backend
 
 %description
 profile/mobile/apps/native/myfiles#02bb4aa37a100ed64cc7b1182212a8c5f5a504f7
-This is a container package which have preload TPK files
+This is a container package which have preload TPK/WGT files
 
 %prep
 %setup -q