Merge from branch tizen_3.0 09/106509/1
authorRavi Kiran K N <ravi.kiran@samsung.com>
Thu, 22 Dec 2016 03:26:04 +0000 (08:56 +0530)
committerRavi Kiran K N <ravi.kiran@samsung.com>
Thu, 22 Dec 2016 03:26:04 +0000 (08:56 +0530)
commit552e17eb9efec55b6258180311fe174b68efb351
tree7093a48c8818be4f8600998c8dbc9e9a828af1c1
parent6ec03b5d8c92295ed667a21eab2680f535ce9fc2
Merge from branch tizen_3.0

Change-Id: Ibda52c3cb3252dfc3d51407af3d08201a79118b3
Signed-off-by: Ravi Kiran K N <ravi.kiran@samsung.com>
368 files changed:
Build/appendix.mk [deleted file]
Build/basedef.mk [deleted file]
Build/flags.mk [deleted file]
Build/makefile [deleted file]
Build/prepost.mk [deleted file]
Build/tooldef.mk [deleted file]
CMakeLists.txt
LICENSE
common/include/vp-chapter-db.h
common/include/vp-debug.h
common/include/vp-file-util.h
common/include/vp-macro.h
common/include/vp-media-content-util.h
common/include/vp-pinch-zoom.h
common/include/vp-preview-db.h
common/include/vp-thumb-db.h
common/include/vp-util.h
common/src/include/vp-db-common.h
common/src/include/vp-db-util.h
common/src/vp-chapter-db.c
common/src/vp-db-util.c
common/src/vp-file-util.c
common/src/vp-media-content-util.c
common/src/vp-pinch-zoom.c
common/src/vp-preview-db.c
common/src/vp-thumb-db.c
common/src/vp-util.c
core/include/vp-drm.h
core/src/include/vp-core-common.h
core/src/vp-drm.c
feature/include/vp-thumb-gen.h
feature/src/include/vp-feature-common.h
feature/src/vp-feature-util.c
feature/src/vp-feature-util.h
feature/src/vp-thumb-gen.c
include/common/mp-drm-ctrl.h
include/common/mp-rotate-ctrl.h
include/common/mp-util-config.h
include/common/mp-util-media-service.h
include/common/mp-util-preference.h
include/common/mp-util.h
include/common/mp-video-info-ctrl.h
include/common/mp-video-sound-manager.h
include/common/mp-video-util-db-controller.h
include/feature/mp-launching-video-displayer.h
include/feature/mp-util-move.h
include/mp-video-log.h
include/mp-video-string-define.h
include/mp-video-type-define.h
include/mp-video-value-define.h
include/video-player.h
include/view/mp-library-view-mgr.h
include/view/mp-video-detail-view.h
include/view/mp-video-list-folder-share-via-view.h
include/view/mp-video-list-personal-ctrl.h
include/view/mp-video-list-personal-view.h
include/view/mp-video-list-remove-ctrl.h
include/view/mp-video-list-remove-view.h
include/view/mp-video-list-share-via-view.h
include/view/mp-video-list-view-common.h
include/view/mp-video-list-view-folder.h
include/view/mp-video-list-view-item-of-folder.h
include/view/mp-video-list-view-main.h
include/view/mp-video-list-view-normal.h
include/view/mp-video-list-view-select.h
include/view/mp-video-list-view-thumbnail.h
include/view/mp-video-search-view.h
include/viewMgr/videos-view-mgr.h
include/widget/mp-external-ug.h
include/widget/mp-footer-toolbar.h
include/widget/mp-util-widget-ctrl.h
include/widget/mp-video-list-auto-play-ctrl.h
include/widget/mp-video-list-option-ctrl.h
include/widget/mp-video-list-sort-ctrl.h
include/widget/mp-video-list-view-as-ctrl.h
include/widget/mp-video-nocontent-layout.h
include/widget/mp-video-rename-ctrl.h
include/widget/mp-video-view-popup-ctrl.h
org.tizen.videos.xml
packaging/org.tizen.videos.spec
playview/include/vp-play-log.h
playview/include/vp-play-type-define.h
playview/include/vp-play-view.h
playview/res/edje/custom/pv-custom-button.edc
playview/res/edje/custom/pv-custom-colorselector.edc
playview/res/edje/custom/pv-custom-define.edc
playview/res/edje/custom/pv-custom-gengrid-item.edc
playview/res/edje/custom/pv-custom-genlist-item.edc
playview/res/edje/custom/pv-custom-image.edc
playview/res/edje/custom/pv-custom-layout.edc
playview/res/edje/custom/pv-custom-naviframe.edc
playview/res/edje/pv-bookmark-item.edc
playview/res/edje/pv-bookmark.edc
playview/res/edje/pv-brightness-popup.edc
playview/res/edje/pv-chapter-main-new.edc
playview/res/edje/pv-colorselector.edc
playview/res/edje/pv-custom-winset.edc
playview/res/edje/pv-gesture.edc
playview/res/edje/pv-image.edc
playview/res/edje/pv-lockscreenmini.edc
playview/res/edje/pv-macro.edc
playview/res/edje/pv-minicontroller.edc
playview/res/edje/pv-multi-main.edc
playview/res/edje/pv-normal-control.edc
playview/res/edje/pv-normal-function.edc
playview/res/edje/pv-normal-main.edc
playview/res/edje/pv-normal-top-control.edc
playview/res/edje/pv-popup.edc
playview/res/edje/pv-progressbar.edc
playview/res/edje/pv-resource.edc
playview/res/edje/pv-sensor-popup.edc
playview/res/edje/pv-speed-popup.edc
playview/res/edje/pv-subtitle-color-popup.edc
playview/res/edje/pv-subtitle.edc
playview/res/edje/pv-tag-buddy.edc
playview/res/edje/pv-tag-preview.edc
playview/res/edje/pv-trim-control.edc
playview/res/edje/pv-trim-item.edc
playview/res/edje/pv-trim-main.edc
playview/res/edje/pv-trim-top-control.edc
playview/res/edje/pv-volume-popup.edc
playview/res/edje/pv-volume.edc
playview/res/edje/pv-zoom-guide.edc
playview/src/common/include/vp-play-config.h
playview/src/common/include/vp-play-preference.h
playview/src/common/include/vp-play-ug.h
playview/src/common/include/vp-play-util.h
playview/src/common/vp-play-config.c
playview/src/common/vp-play-preference.c
playview/src/common/vp-play-ug.c
playview/src/common/vp-play-util.c
playview/src/core/include/vp-avrcp.h
playview/src/core/include/vp-device-language.h
playview/src/core/include/vp-device.h
playview/src/core/include/vp-hollic.h
playview/src/core/include/vp-image-util.h
playview/src/core/include/vp-media-contents.h
playview/src/core/include/vp-media-key.h
playview/src/core/include/vp-mm-player.h
playview/src/core/include/vp-multi-path.h
playview/src/core/include/vp-sensor.h
playview/src/core/include/vp-sound.h
playview/src/core/vp-avrcp.c
playview/src/core/vp-device-language.c
playview/src/core/vp-device.c
playview/src/core/vp-hollic.c
playview/src/core/vp-image-util.c
playview/src/core/vp-media-contents.c
playview/src/core/vp-media-key.c
playview/src/core/vp-mm-player.c
playview/src/core/vp-multi-path.c
playview/src/core/vp-sensor.c
playview/src/core/vp-sound.c
playview/src/feature/include/vp-audio-track.h
playview/src/feature/include/vp-capture.h
playview/src/feature/include/vp-detail.h
playview/src/feature/include/vp-play-speed.h
playview/src/feature/include/vp-repeat.h
playview/src/feature/include/vp-setting.h
playview/src/feature/include/vp-share.h
playview/src/feature/include/vp-sound-alive.h
playview/src/feature/include/vp-sound-path.h
playview/src/feature/include/vp-subtitle-alignment.h
playview/src/feature/include/vp-subtitle-bg-color.h
playview/src/feature/include/vp-subtitle-color.h
playview/src/feature/include/vp-subtitle-edge.h
playview/src/feature/include/vp-subtitle-font.h
playview/src/feature/include/vp-subtitle-select.h
playview/src/feature/include/vp-subtitle-size.h
playview/src/feature/include/vp-subtitle-sync.h
playview/src/feature/include/vp-subtitle-track.h
playview/src/feature/include/vp-subtitle.h
playview/src/feature/include/vp-zoom-guide.h
playview/src/feature/vp-audio-track.c
playview/src/feature/vp-capture.c
playview/src/feature/vp-detail.c
playview/src/feature/vp-play-speed.c
playview/src/feature/vp-repeat.c
playview/src/feature/vp-setting.c
playview/src/feature/vp-share.c
playview/src/feature/vp-sound-alive.c
playview/src/feature/vp-sound-path.c
playview/src/feature/vp-subtitle-alignment.c
playview/src/feature/vp-subtitle-bg-color.c
playview/src/feature/vp-subtitle-color.c
playview/src/feature/vp-subtitle-edge.c
playview/src/feature/vp-subtitle-font.c
playview/src/feature/vp-subtitle-select.c
playview/src/feature/vp-subtitle-size.c
playview/src/feature/vp-subtitle-sync.c
playview/src/feature/vp-subtitle-track.c
playview/src/feature/vp-subtitle.c
playview/src/feature/vp-zoom-guide.c
playview/src/include/vp-play-macro-define.h
playview/src/include/vp-play-string-define.h
playview/src/include/vp-play-value-define.h
playview/src/view/include/vp-play-normal-view.h
playview/src/view/include/vp-play-normal-view_bk.h
playview/src/view/include/vp-play-view-priv.h
playview/src/view/vp-play-normal-view.c
playview/src/vp-play-view.c
playview/src/widget/include/vp-play-bookmark.h
playview/src/widget/include/vp-play-brightness-popup.h
playview/src/widget/include/vp-play-button.h
playview/src/widget/include/vp-play-loading-ani.h
playview/src/widget/include/vp-play-lockscreenmc.h
playview/src/widget/include/vp-play-minicontroller.h
playview/src/widget/include/vp-play-more.h
playview/src/widget/include/vp-play-popup.h
playview/src/widget/include/vp-play-progressbar.h
playview/src/widget/include/vp-play-subtitle.h
playview/src/widget/include/vp-play-volume-popup.h
playview/src/widget/include/vp-play-volume.h
playview/src/widget/vp-play-bookmark.c
playview/src/widget/vp-play-brightness-popup.c
playview/src/widget/vp-play-button.c
playview/src/widget/vp-play-loading-ani.c
playview/src/widget/vp-play-lockscreenmc.c
playview/src/widget/vp-play-minicontroller.c
playview/src/widget/vp-play-more.c
playview/src/widget/vp-play-popup.c
playview/src/widget/vp-play-progressbar.c
playview/src/widget/vp-play-subtitle.c
playview/src/widget/vp-play-volume-popup.c
playview/src/widget/vp-play-volume.c
res/edje/edc_image_macro.edc
res/edje/image_res.edc
res/edje/landscape_thumbnail.edc
res/edje/panel.edc
res/edje/popup_progressbar.edc
res/edje/vp-button-white.edc
res/edje/vp-check.edc
res/edje/vp-controlbar.edc
res/edje/vp-ctxpopup-option.edc
res/edje/vp-ctxpopup.edc
res/edje/vp-custom-genlist-miltiline.edc
res/edje/vp-custom-winset-style.edc
res/edje/vp-detail-popup.edc
res/edje/vp-device-list-internal.edc
res/edje/vp-entry-popup.edc
res/edje/vp-gengrid-custom.edc
res/edje/vp-gengrid.edc
res/edje/vp-genlist-custom.edc
res/edje/vp-genlist-no-item.edc
res/edje/vp-images.edc
res/edje/vp-layout.edc
res/edje/vp-main-layout.edc
res/edje/vp-main-listview-internal.edc
res/edje/vp-main-listview-preview.edc
res/edje/vp-motion-popup.edc
res/edje/vp-naviframe.edc
res/edje/vp-nocontents.edc
res/edje/vp-numberinfo.edc
res/edje/vp-progressbar-list.edc
res/edje/vp-remove-list-internal.edc
res/edje/vp-scroller-custom.edc
res/edje/vp-search-view-internal.edc
res/edje/vp-speedbox-popup.edc
res/edje/vp-thumbnail-view.edc
res/edje/vp-toolbar.edc
res/edje/vp_font.edc
res/po/ca.po
res/shared/res/video.edc [changed mode: 0755->0644]
src/common/mp-drm-ctrl.c
src/common/mp-rotate-ctrl.c
src/common/mp-util-config.c
src/common/mp-util-media-service.c
src/common/mp-util-preference.c
src/common/mp-util.c
src/common/mp-video-info-ctrl.c
src/common/mp-video-sound-manager.c
src/common/mp-video-util-db-controller.c
src/feature/mp-launching-video-displayer.c [changed mode: 0755->0644]
src/feature/mp-util-move.c
src/video-player.c
src/view/mp-library-view-mgr.c
src/view/mp-video-detail-view.c
src/view/mp-video-list-folder-share-via-view.c
src/view/mp-video-list-personal-ctrl.c
src/view/mp-video-list-personal-view.c
src/view/mp-video-list-remove-ctrl.c
src/view/mp-video-list-remove-view.c
src/view/mp-video-list-share-via-view.c
src/view/mp-video-list-view-common.c
src/view/mp-video-list-view-folder.c
src/view/mp-video-list-view-item-of-folder.c
src/view/mp-video-list-view-main.c
src/view/mp-video-list-view-normal.c
src/view/mp-video-list-view-select.c
src/view/mp-video-list-view-thumbnail.c
src/view/mp-video-search-view.c
src/viewMgr/videos-view-mgr.c
src/widget/mp-external-ug.c
src/widget/mp-footer-toolbar.c
src/widget/mp-util-widget-ctrl.c
src/widget/mp-video-list-auto-play-ctrl.c
src/widget/mp-video-list-option-ctrl.c
src/widget/mp-video-list-sort-ctrl.c
src/widget/mp-video-list-view-as-ctrl.c
src/widget/mp-video-nocontent-layout.c
src/widget/mp-video-rename-ctrl.c
src/widget/mp-video-view-popup-ctrl.c
tizen-manifest.xml
video-downloader/include/VppDownload.h
video-downloader/src/VppDownload.c
vp-main/Build/appendix.mk [deleted file]
vp-main/Build/basedef.mk [deleted file]
vp-main/Build/flags.mk [deleted file]
vp-main/Build/makefile [deleted file]
vp-main/Build/prepost.mk [deleted file]
vp-main/Build/tooldef.mk [deleted file]
vp-main/include/serviceParser/vp-service-parser.h
vp-main/include/vp-main.h
vp-main/org.tizen.video-player.xml
vp-main/project_def.prop
vp-main/res/po/ar.po
vp-main/res/po/az.po
vp-main/res/po/bg.po
vp-main/res/po/ca.po
vp-main/res/po/cs.po
vp-main/res/po/da.po
vp-main/res/po/de.po
vp-main/res/po/el_GR.po
vp-main/res/po/en.po
vp-main/res/po/en_PH.po
vp-main/res/po/en_US.po
vp-main/res/po/es_ES.po
vp-main/res/po/es_US.po
vp-main/res/po/et.po
vp-main/res/po/eu.po
vp-main/res/po/fi.po
vp-main/res/po/fr.po
vp-main/res/po/fr_CA.po
vp-main/res/po/ga.po
vp-main/res/po/gl.po
vp-main/res/po/hi.po
vp-main/res/po/hr.po
vp-main/res/po/hu.po
vp-main/res/po/hy.po
vp-main/res/po/is.po
vp-main/res/po/it_IT.po
vp-main/res/po/ja_JP.po
vp-main/res/po/ka.po
vp-main/res/po/kk.po
vp-main/res/po/ko_KR.po
vp-main/res/po/lt.po
vp-main/res/po/lv.po
vp-main/res/po/mk.po
vp-main/res/po/nb.po
vp-main/res/po/nl.po
vp-main/res/po/pl.po
vp-main/res/po/pt_BR.po
vp-main/res/po/pt_PT.po
vp-main/res/po/ro.po
vp-main/res/po/ru_RU.po
vp-main/res/po/sk.po
vp-main/res/po/sl.po
vp-main/res/po/sr.po
vp-main/res/po/sv.po
vp-main/res/po/tr_TR.po
vp-main/res/po/uk.po
vp-main/res/po/uz.po
vp-main/res/po/zh_CN.po
vp-main/res/po/zh_HK.po
vp-main/res/po/zh_TW.po
vp-main/src/serviceParser/vp-service-parser.c
vp-main/src/vp-main.c
vp-main/tizen-manifest.xml