Merge "Add video view control" into devel/master

diff --combined build/tizen/dali-toolkit/Makefile.am
index 1f52660,469c9ae..2cc6de7
--- 1/build/tizen/dali-toolkit/Makefile.am
--- 2/build/tizen/dali-toolkit/Makefile.am
+++ b/build/tizen/dali-toolkit/Makefile.am
@@@ -101,6 -101,7 +101,6 @@@ develapieffectsviewdir =        $(devel
  develapimagnifierdir =          $(develapicontrolsdir)/magnifier
  develapirendererfactorydir =    $(develapicontrolsdir)/renderer-factory
  develapipopupdir =              $(develapicontrolsdir)/popup
 -develapisliderdir =             $(develapicontrolsdir)/slider
  develapishadowviewdir =         $(develapicontrolsdir)/shadow-view
  develapisuperblurviewdir =      $(develapicontrolsdir)/super-blur-view
  develapifocusmanagerdir =       $(develapidir)/focus-manager
@@@ -125,6 -126,7 +125,6 @@@ develapirendererfactory_HEADERS =   $(d
  develapiscripting_HEADERS =         $(devel_api_scripting_header_files)
  develapishadowview_HEADERS =        $(devel_api_shadow_view_header_files)
  develapishadereffects_HEADERS =     $(devel_api_shader_effects_header_files)
 -develapislider_HEADERS =            $(devel_api_slider_header_files)
  develapisuperblurview_HEADERS =     $(devel_api_super_blur_view_header_files)
  develapitoolbar_HEADERS =           $(devel_api_tool_bar_header_files)
  develapitransitioneffects_HEADERS = $(devel_api_transition_effects_header_files)
@@@ -140,6 -142,7 +140,7 @@@ publicapidefaultcontrolsdir =      $(pu
  publicapiflexcontainerdir =        $(publicapicontrolsdir)/flex-container
  publicapigaussianblurviewdir =     $(publicapicontrolsdir)/gaussian-blur-view
  publicapiimageviewdir =            $(publicapicontrolsdir)/image-view
+ publicapivideoviewdir =            $(publicapicontrolsdir)/video-view
  publicapimodel3dviewdir =          $(publicapicontrolsdir)/model3d-view
  publicapipageturnviewdir =         $(publicapicontrolsdir)/page-turn-view
  publicapiscrollbardir =            $(publicapicontrolsdir)/scroll-bar
@@@ -151,7 -154,6 +152,7 @@@ publicapitableviewdir =            $(pu
  publicapitextcontrolsdir =         $(publicapicontrolsdir)/text-controls
  publicapifocusmanagerdir =         $(publicapidir)/focus-manager
  publicapirenderingbackenddir =     $(publicapidir)/text
 +publicapisliderdir =               $(publicapicontrolsdir)/slider
  
  # public api headers
  publicapi_HEADERS =                     $(public_api_header_files)
@@@ -163,6 -165,7 +164,7 @@@ publicapidefaultcontrols_HEADERS 
  publicapiflexcontainer_HEADERS =        $(public_api_flex_container_header_files)
  publicapigaussianblurview_HEADERS =     $(public_api_gaussian_blur_view_header_files)
  publicapiimageview_HEADERS =            $(public_api_image_view_header_files)
+ publicapivideoview_HEADERS =            $(public_api_video_view_header_files)
  publicapiitemview_HEADERS =             $(public_api_item_view_header_files)
  publicapimodel3dview_HEADERS =          $(public_api_model3d_view_header_files)
  publicapipageturnview_HEADERS =         $(public_api_page_turn_view_header_files)
@@@ -174,7 -177,6 +176,7 @@@ publicapitableview_HEADERS 
  publicapitextcontrols_HEADERS =         $(public_api_text_controls_header_files)
  publicapifocusmanager_HEADERS =         $(public_api_focus_manager_header_files)
  publicapirenderingbackend_HEADERS =     $(public_api_rendering_backend_header_files)
 +publicapislider_HEADERS =               $(public_api_slider_header_files)
  
  # package doxygen file (contains doxygen grouping information)
  packagedoxydir = $(topleveldir)/doc

diff --combined dali-toolkit/dali-toolkit.h
index 055ecd2,b46a97f..1dc6861
--- 1/dali-toolkit/dali-toolkit.h
--- 2/dali-toolkit/dali-toolkit.h
+++ b/dali-toolkit/dali-toolkit.h
@@@ -47,11 -47,11 +47,12 @@@
  #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-path-effect.h>
  #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
  #include <dali-toolkit/public-api/controls/scrollable/scrollable.h>
 +#include <dali-toolkit/public-api/controls/slider/slider.h>
  #include <dali-toolkit/public-api/controls/table-view/table-view.h>
  #include <dali-toolkit/public-api/controls/text-controls/text-editor.h>
  #include <dali-toolkit/public-api/controls/text-controls/text-field.h>
  #include <dali-toolkit/public-api/controls/text-controls/text-label.h>
+ #include <dali-toolkit/public-api/controls/video-view/video-view.h>
  #include <dali-toolkit/public-api/accessibility-manager/accessibility-manager.h>
  #include <dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h>
  #include <dali-toolkit/public-api/styling/style-manager.h>

diff --combined dali-toolkit/public-api/file.list
index a9fc458,fdd43d0..f036d13
--- 1/dali-toolkit/public-api/file.list
--- 2/dali-toolkit/public-api/file.list
+++ b/dali-toolkit/public-api/file.list
@@@ -24,7 -24,6 +24,7 @@@ public_api_src_files = 
    $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-page-path-effect.cpp \
    $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view.cpp \
    $(public_api_src_dir)/controls/scrollable/scrollable.cpp \
 +  $(public_api_src_dir)/controls/slider/slider.cpp \
    $(public_api_src_dir)/controls/table-view/table-view.cpp \
    $(public_api_src_dir)/controls/text-controls/text-editor.cpp \
    $(public_api_src_dir)/controls/text-controls/text-label.cpp \
@@@ -33,6 -32,7 +33,7 @@@
    $(public_api_src_dir)/styling/style-manager.cpp \
    $(public_api_src_dir)/accessibility-manager/accessibility-manager.cpp \
    $(public_api_src_dir)/focus-manager/keyboard-focus-manager.cpp \
+   $(public_api_src_dir)/controls/video-view/video-view.cpp \
    $(public_api_src_dir)/dali-toolkit-version.cpp \
    $(public_api_src_dir)/enums.cpp
  
@@@ -95,9 -95,6 +96,9 @@@ public_api_scroll_view_header_files = 
    $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-page-path-effect.h \
    $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view.h
  
 +public_api_slider_header_files = \
 +  $(public_api_src_dir)/controls/slider/slider.h
 +
  public_api_styling_header_files = \
    $(public_api_src_dir)/styling/style-manager.h
  
@@@ -117,3 -114,6 +118,6 @@@ public_api_focus_manager_header_files 
  
  public_api_rendering_backend_header_files = \
    $(public_api_src_dir)/text/rendering-backend.h
+ 
+ public_api_video_view_header_files = \
+   $(public_api_src_dir)/controls/video-view/video-view.h