From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Mon, 3 Dec 2018 14:56:09 +0000 (+0000)
Subject: Merge "add drag&drop support in actor level" into devel/master
X-Git-Tag: dali_1.3.53~1
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=ed980a3b418d7a235d4774b786d84974421650fd;hp=-c

Merge "add drag&drop support in actor level" into devel/master
---

ed980a3b418d7a235d4774b786d84974421650fd
diff --combined automated-tests/src/dali-toolkit/CMakeLists.txt
index c8215a5,e0b1cab..05e2ccc
--- a/automated-tests/src/dali-toolkit/CMakeLists.txt
+++ b/automated-tests/src/dali-toolkit/CMakeLists.txt
@@@ -10,7 -10,6 +10,7 @@@ SET(TC_SOURCE
    utc-Dali-AbsoluteLayout.cpp
    utc-Dali-Alignment.cpp
    utc-Dali-AnimatedImageVisual.cpp
 +  utc-Dali-AnimatedVectorImageVisual.cpp
    utc-Dali-BinLayout.cpp
    utc-Dali-BloomView.cpp
    utc-Dali-BubbleEmitter.cpp
@@@ -77,6 -76,7 +77,7 @@@
    utc-Dali-AsyncImageLoader.cpp
    utc-Dali-SyncImageLoader.cpp
    utc-Dali-ControlWrapper.cpp
+   utc-Dali-DragAndDropDetector.cpp
  )
  
  # Append list of test harness files (Won't get parsed for test cases)
diff --combined dali-toolkit/devel-api/file.list
index 2ddabe9,14cb246..ebb9631
--- a/dali-toolkit/devel-api/file.list
+++ b/dali-toolkit/devel-api/file.list
@@@ -54,7 -54,8 +54,8 @@@ devel_api_src_files = 
    $(devel_api_src_dir)/visual-factory/transition-data.cpp \
    $(devel_api_src_dir)/visual-factory/visual-factory.cpp \
    $(devel_api_src_dir)/visual-factory/visual-base.cpp \
-   $(devel_api_src_dir)/controls/gaussian-blur-view/gaussian-blur-view.cpp
+   $(devel_api_src_dir)/controls/gaussian-blur-view/gaussian-blur-view.cpp \
+   $(devel_api_src_dir)/drag-drop-detector/drag-and-drop-detector.cpp
  
  # Add devel header files here
  
@@@ -130,7 -131,6 +131,7 @@@ devel_api_visual_factory_header_files 
  devel_api_visuals_header_files = \
    $(devel_api_src_dir)/visuals/animated-gradient-visual-properties-devel.h \
    $(devel_api_src_dir)/visuals/animated-image-visual-actions-devel.h \
 +  $(devel_api_src_dir)/visuals/animated-vector-image-visual-actions-devel.h \
    $(devel_api_src_dir)/visuals/color-visual-properties-devel.h \
    $(devel_api_src_dir)/visuals/image-visual-properties-devel.h \
    $(devel_api_src_dir)/visuals/image-visual-actions-devel.h \
@@@ -198,3 -198,6 +199,6 @@@ devel_api_gaussian_blur_view_header_fil
  
  devel_api_web_view_header_files = \
    $(devel_api_src_dir)/controls/web-view/web-view.h
+ 
+ devel_api_drag_and_drop_detector_header_files = \
+   $(devel_api_src_dir)/drag-drop-detector/drag-and-drop-detector.h
diff --combined dali-toolkit/internal/file.list
index 44be18c,1799a2a..89a3d66
--- a/dali-toolkit/internal/file.list
+++ b/dali-toolkit/internal/file.list
@@@ -28,8 -28,6 +28,8 @@@ toolkit_src_files = 
     $(toolkit_src_dir)/visuals/animated-image/fixed-image-cache.cpp \
     $(toolkit_src_dir)/visuals/animated-image/rolling-image-cache.cpp \
     $(toolkit_src_dir)/visuals/animated-image/rolling-gif-image-cache.cpp \
 +   $(toolkit_src_dir)/visuals/animated-vector-image/animated-vector-image-visual.cpp \
 +   $(toolkit_src_dir)/visuals/animated-vector-image/vector-image-rasterize-thread.cpp \
     $(toolkit_src_dir)/visuals/border/border-visual.cpp \
     $(toolkit_src_dir)/visuals/color/color-visual.cpp \
     $(toolkit_src_dir)/visuals/gradient/gradient-visual.cpp \
@@@ -175,4 -173,5 +175,5 @@@
     $(toolkit_src_dir)/transition-effects/cube-transition-wave-effect-impl.cpp \
     $(toolkit_src_dir)/scripting/script-impl.cpp \
     $(toolkit_src_dir)/scripting/script-plugin-proxy.cpp \
-    $(toolkit_src_dir)/text/xhtml-entities.cpp
+    $(toolkit_src_dir)/text/xhtml-entities.cpp \
+    $(toolkit_src_dir)/drag-drop-detector/drag-and-drop-detector-impl.cpp