VR: Merge devel/master into devel/new_vr branch 89/88289/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Wed, 3 Aug 2016 14:34:34 +0000 (15:34 +0100)
committerTom Robinson <tom.robinson@samsung.com>
Thu, 15 Sep 2016 18:26:45 +0000 (19:26 +0100)
commit651cf4ef88cfffe1508e1be61f05378e8925eb69
treeb0b34e8c864c4dd5c2df7175950b94aaf3ac169e
parent901499a7ec86ca342c4e0fdec62a6e4eeeee5c5f
VR: Merge devel/master into devel/new_vr branch

Change-Id: I0435a37ddd0f3c0383bbbb208864664b174e2889
308 files changed:
automated-tests/patch-coverage.pl
automated-tests/src/dali-toolkit-internal/CMakeLists.txt
automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-model.cpp
automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Controller.cpp [new file with mode: 0644]
automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Layout.cpp
automated-tests/src/dali-toolkit-internal/utc-Dali-Text-MultiLanguage.cpp
automated-tests/src/dali-toolkit-internal/utc-Dali-VisualFactoryResolveUrl.cpp [new file with mode: 0644]
automated-tests/src/dali-toolkit-styling/utc-Dali-StyleManager.cpp
automated-tests/src/dali-toolkit/CMakeLists.txt
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.cpp
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.h
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-toolkit-test-suite-utils.h
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-trace-call-stack.cpp
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-trace-call-stack.h
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-accessibility-adaptor.cpp
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor-impl.h [new file with mode: 0644]
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor.cpp
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-application.cpp
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard.cpp
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard.h
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.cpp
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.h
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.cpp
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.h
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-test-application.h
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-text-abstraction.cpp
automated-tests/src/dali-toolkit/utc-Dali-AccessibilityManager.cpp
automated-tests/src/dali-toolkit/utc-Dali-ControlImpl.cpp
automated-tests/src/dali-toolkit/utc-Dali-DebugRendering.cpp [moved from automated-tests/src/dali-toolkit/utc-Dali-DebugVisual.cpp with 92% similarity]
automated-tests/src/dali-toolkit/utc-Dali-GaussianBlurView.cpp
automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp
automated-tests/src/dali-toolkit/utc-Dali-ItemView.cpp
automated-tests/src/dali-toolkit/utc-Dali-Model3dView.cpp
automated-tests/src/dali-toolkit/utc-Dali-ProgressBar.cpp [new file with mode: 0644]
automated-tests/src/dali-toolkit/utc-Dali-ScrollView.cpp
automated-tests/src/dali-toolkit/utc-Dali-TextEditor.cpp
automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp
automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp
automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp
automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp
build/tizen/dali-toolkit/Makefile.am
build/tizen/docs/dali.doxy.in
dali-toolkit/dali-toolkit.h
dali-toolkit/devel-api/builder/builder.h
dali-toolkit/devel-api/builder/tree-node.cpp
dali-toolkit/devel-api/builder/tree-node.h
dali-toolkit/devel-api/controls/bloom-view/bloom-view.h
dali-toolkit/devel-api/controls/gaussian-blur-view/gaussian-blur-view.cpp [moved from dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.cpp with 96% similarity]
dali-toolkit/devel-api/controls/gaussian-blur-view/gaussian-blur-view.h [moved from dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h with 99% similarity]
dali-toolkit/devel-api/controls/progress-bar/progress-bar.cpp [new file with mode: 0644]
dali-toolkit/devel-api/controls/progress-bar/progress-bar.h [new file with mode: 0644]
dali-toolkit/devel-api/file.list
dali-toolkit/devel-api/shader-effects/bendy-effect.h
dali-toolkit/devel-api/shader-effects/blind-effect.h
dali-toolkit/devel-api/shader-effects/bouncing-effect.h
dali-toolkit/devel-api/shader-effects/carousel-effect.h
dali-toolkit/devel-api/shader-effects/displacement-effect.h
dali-toolkit/devel-api/shader-effects/dissolve-local-effect.h
dali-toolkit/devel-api/shader-effects/iris-effect.h
dali-toolkit/devel-api/shader-effects/mask-effect.h
dali-toolkit/devel-api/shader-effects/mirror-effect.h
dali-toolkit/devel-api/shader-effects/overlay-effect.h
dali-toolkit/devel-api/shader-effects/quadratic-bezier.h
dali-toolkit/devel-api/shader-effects/ripple-effect.h
dali-toolkit/devel-api/shader-effects/ripple2d-effect.h
dali-toolkit/devel-api/shader-effects/shear-effect.h
dali-toolkit/devel-api/shader-effects/soft-button-effect.h
dali-toolkit/devel-api/shader-effects/spot-effect.h
dali-toolkit/devel-api/shader-effects/square-dissolve-effect.h
dali-toolkit/devel-api/shader-effects/swirl-effect.h
dali-toolkit/devel-api/visual-factory/visual-base.cpp
dali-toolkit/devel-api/visual-factory/visual-base.h
dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.cpp
dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h
dali-toolkit/internal/builder/builder-get-is.inl.h
dali-toolkit/internal/builder/builder-impl.cpp
dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp
dali-toolkit/internal/controls/bloom-view/bloom-view-impl.h
dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp
dali-toolkit/internal/controls/buttons/button-impl.cpp
dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp
dali-toolkit/internal/controls/buttons/check-box-button-impl.h
dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp
dali-toolkit/internal/controls/effects-view/effects-view-impl.h
dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp
dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.h
dali-toolkit/internal/controls/image-view/image-view-impl.cpp
dali-toolkit/internal/controls/image-view/image-view-impl.h
dali-toolkit/internal/controls/model3d-view/model3d-view-impl.cpp
dali-toolkit/internal/controls/progress-bar/progress-bar-impl.cpp [new file with mode: 0755]
dali-toolkit/internal/controls/progress-bar/progress-bar-impl.h [new file with mode: 0755]
dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h
dali-toolkit/internal/controls/slider/slider-impl.cpp
dali-toolkit/internal/controls/slider/slider-impl.h
dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp
dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h
dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
dali-toolkit/internal/controls/text-controls/text-editor-impl.h
dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
dali-toolkit/internal/controls/text-controls/text-field-impl.h
dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
dali-toolkit/internal/controls/text-controls/text-label-impl.h
dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp
dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.cpp
dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.h
dali-toolkit/internal/file.list
dali-toolkit/internal/filters/blur-two-pass-filter.cpp
dali-toolkit/internal/filters/emboss-filter.cpp
dali-toolkit/internal/filters/spread-filter.cpp
dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h
dali-toolkit/internal/styling/style-manager-impl.cpp
dali-toolkit/internal/text/input-style.h
dali-toolkit/internal/text/logical-model-impl.cpp
dali-toolkit/internal/text/multi-language-helper-functions.cpp
dali-toolkit/internal/text/multi-language-helper-functions.h
dali-toolkit/internal/text/multi-language-support-impl.cpp
dali-toolkit/internal/text/multi-language-support-impl.h
dali-toolkit/internal/text/multi-language-support.cpp
dali-toolkit/internal/text/multi-language-support.h
dali-toolkit/internal/text/text-control-interface.h
dali-toolkit/internal/text/text-controller-impl.cpp
dali-toolkit/internal/text/text-controller-impl.h
dali-toolkit/internal/text/text-controller.cpp
dali-toolkit/internal/text/text-controller.h
dali-toolkit/internal/text/text-font-style.cpp
dali-toolkit/internal/text/text-scroller.cpp
dali-toolkit/internal/visuals/border/border-visual.cpp
dali-toolkit/internal/visuals/border/border-visual.h
dali-toolkit/internal/visuals/color/color-visual.cpp
dali-toolkit/internal/visuals/color/color-visual.h
dali-toolkit/internal/visuals/gradient/gradient-visual.cpp
dali-toolkit/internal/visuals/gradient/gradient-visual.h
dali-toolkit/internal/visuals/image/batch-image-visual.cpp
dali-toolkit/internal/visuals/image/batch-image-visual.h
dali-toolkit/internal/visuals/image/image-visual.cpp
dali-toolkit/internal/visuals/image/image-visual.h
dali-toolkit/internal/visuals/mesh/mesh-visual.cpp
dali-toolkit/internal/visuals/mesh/mesh-visual.h
dali-toolkit/internal/visuals/npatch/npatch-visual.cpp
dali-toolkit/internal/visuals/npatch/npatch-visual.h
dali-toolkit/internal/visuals/primitive/primitive-visual.cpp
dali-toolkit/internal/visuals/primitive/primitive-visual.h
dali-toolkit/internal/visuals/svg/svg-visual.cpp
dali-toolkit/internal/visuals/svg/svg-visual.h
dali-toolkit/internal/visuals/visual-base-data-impl.h
dali-toolkit/internal/visuals/visual-base-impl.cpp
dali-toolkit/internal/visuals/visual-base-impl.h
dali-toolkit/internal/visuals/visual-factory-cache.cpp
dali-toolkit/internal/visuals/visual-factory-cache.h
dali-toolkit/internal/visuals/visual-factory-impl.cpp
dali-toolkit/internal/visuals/visual-factory-impl.h
dali-toolkit/internal/visuals/visual-factory-resolve-url.h [new file with mode: 0644]
dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp [moved from dali-toolkit/internal/visuals/debug/debug-visual.cpp with 84% similarity]
dali-toolkit/internal/visuals/wireframe/wireframe-visual.h [moved from dali-toolkit/internal/visuals/debug/debug-visual.h with 74% similarity]
dali-toolkit/public-api/controls/alignment/alignment.h
dali-toolkit/public-api/controls/buttons/button.h
dali-toolkit/public-api/controls/buttons/check-box-button.h
dali-toolkit/public-api/controls/buttons/push-button.h
dali-toolkit/public-api/controls/buttons/radio-button.h
dali-toolkit/public-api/controls/control-impl.cpp
dali-toolkit/public-api/controls/control-impl.h
dali-toolkit/public-api/controls/default-controls/solid-color-actor.cpp [deleted file]
dali-toolkit/public-api/controls/default-controls/solid-color-actor.h [deleted file]
dali-toolkit/public-api/controls/flex-container/flex-container.h
dali-toolkit/public-api/controls/image-view/image-view.h
dali-toolkit/public-api/controls/model3d-view/model3d-view.h
dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h
dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h
dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h
dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h
dali-toolkit/public-api/controls/scrollable/item-view/item-view.h
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-path-effect.h
dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h
dali-toolkit/public-api/controls/scrollable/scrollable.h
dali-toolkit/public-api/controls/slider/slider.h
dali-toolkit/public-api/controls/table-view/table-view.h
dali-toolkit/public-api/controls/text-controls/text-editor.cpp
dali-toolkit/public-api/controls/text-controls/text-editor.h
dali-toolkit/public-api/controls/text-controls/text-field.cpp
dali-toolkit/public-api/controls/text-controls/text-field.h
dali-toolkit/public-api/controls/text-controls/text-label.h
dali-toolkit/public-api/controls/video-view/video-view.h
dali-toolkit/public-api/dali-toolkit-version.cpp
dali-toolkit/public-api/file.list
dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h
dali-toolkit/public-api/styling/style-manager.h
dali-toolkit/public-api/visuals/batch-image-visual-properties.h [deleted file]
dali-toolkit/public-api/visuals/image-visual-properties.h
dali-toolkit/public-api/visuals/primitive-visual-properties.h
dali-toolkit/public-api/visuals/visual-properties.h
dali-toolkit/styles/1920x1080/dali-toolkit-default-theme.json [new file with mode: 0644]
dali-toolkit/styles/1920x1080/images/cursor_handler_drop_center.png [new file with mode: 0644]
dali-toolkit/styles/1920x1080/images/selection_handle_drop_left.png [new file with mode: 0644]
dali-toolkit/styles/1920x1080/images/selection_handle_drop_right.png [new file with mode: 0644]
dali-toolkit/styles/480x800/dali-toolkit-default-theme.json
dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
doc/dali-toolkit-doc.h
docs/content/images/debug-rendering/debug-blocks.png [moved from docs/content/images/debug-visual/debug-blocks.png with 100% similarity]
docs/content/images/visuals/wireframe-visual.png [new file with mode: 0644]
docs/content/main.md
docs/content/programming-guide/handle-body-idiom.h
docs/content/programming-guide/hello-world.h
docs/content/programming-guide/image-view.h
docs/content/programming-guide/properties.h
docs/content/programming-guide/styling.h
docs/content/shared-javascript-and-cpp-documentation/accessibility.md
docs/content/shared-javascript-and-cpp-documentation/animation.md
docs/content/shared-javascript-and-cpp-documentation/copy-and-paste.md
docs/content/shared-javascript-and-cpp-documentation/creating-custom-controls.md
docs/content/shared-javascript-and-cpp-documentation/dali-introduction.md
docs/content/shared-javascript-and-cpp-documentation/debug-rendering.md [new file with mode: 0644]
docs/content/shared-javascript-and-cpp-documentation/debug-visual.md [deleted file]
docs/content/shared-javascript-and-cpp-documentation/documentation-guide.md
docs/content/shared-javascript-and-cpp-documentation/emscripten.md
docs/content/shared-javascript-and-cpp-documentation/flex-container.md
docs/content/shared-javascript-and-cpp-documentation/font-selection.md
docs/content/shared-javascript-and-cpp-documentation/fundamentals.md
docs/content/shared-javascript-and-cpp-documentation/javascript-wrapping-guide.md
docs/content/shared-javascript-and-cpp-documentation/layer.md
docs/content/shared-javascript-and-cpp-documentation/markup-style.md
docs/content/shared-javascript-and-cpp-documentation/multi-touch-guide.md
docs/content/shared-javascript-and-cpp-documentation/performance-profiling.md
docs/content/shared-javascript-and-cpp-documentation/performance-tips.md
docs/content/shared-javascript-and-cpp-documentation/popup.md
docs/content/shared-javascript-and-cpp-documentation/resource-image-scaling.md
docs/content/shared-javascript-and-cpp-documentation/resources.md
docs/content/shared-javascript-and-cpp-documentation/script-hello.md
docs/content/shared-javascript-and-cpp-documentation/script-json-specification.md
docs/content/shared-javascript-and-cpp-documentation/script-overview.md
docs/content/shared-javascript-and-cpp-documentation/stage-hand.md
docs/content/shared-javascript-and-cpp-documentation/text-auto-scrolling.md
docs/content/shared-javascript-and-cpp-documentation/text-field.md
docs/content/shared-javascript-and-cpp-documentation/visuals.md
packaging/dali-addon.spec
packaging/dali-toolkit.spec
plugins/dali-script-v8/src/constants/constants-wrapper.cpp
plugins/dali-script-v8/src/image/frame-buffer-image-api.cpp
plugins/dali-swig/.gitignore [new file with mode: 0644]
plugins/dali-swig/Makefile.am [new file with mode: 0644]
plugins/dali-swig/README [new file with mode: 0644]
plugins/dali-swig/SWIG/dali-adaptor.i [new file with mode: 0644]
plugins/dali-swig/SWIG/dali-core.i [new file with mode: 0644]
plugins/dali-swig/SWIG/dali-operator.i [new file with mode: 0644]
plugins/dali-swig/SWIG/dali-toolkit.i [new file with mode: 0644]
plugins/dali-swig/SWIG/dali.i [new file with mode: 0644]
plugins/dali-swig/SWIG/events/accessibilitymanager-event.i [new file with mode: 0644]
plugins/dali-swig/SWIG/events/actor-event.i [new file with mode: 0644]
plugins/dali-swig/SWIG/events/animation-event.i [new file with mode: 0644]
plugins/dali-swig/SWIG/events/application-event.i [new file with mode: 0644]
plugins/dali-swig/SWIG/events/builder-event.i [new file with mode: 0644]
plugins/dali-swig/SWIG/events/button-event.i [new file with mode: 0644]
plugins/dali-swig/SWIG/events/control-event.i [new file with mode: 0644]
plugins/dali-swig/SWIG/events/gaussian-blur-view-event.i [new file with mode: 0644]
plugins/dali-swig/SWIG/events/image-event.i [new file with mode: 0644]
plugins/dali-swig/SWIG/events/itemview-event.i [new file with mode: 0644]
plugins/dali-swig/SWIG/events/keyboardFocusManager-event.i [new file with mode: 0644]
plugins/dali-swig/SWIG/events/longpressgesture-event.i [new file with mode: 0644]
plugins/dali-swig/SWIG/events/objectregistry-event.i [new file with mode: 0644]
plugins/dali-swig/SWIG/events/pageturnview-event.i [new file with mode: 0644]
plugins/dali-swig/SWIG/events/pangesture-event.i [new file with mode: 0644]
plugins/dali-swig/SWIG/events/pinchgesture-event.i [new file with mode: 0644]
plugins/dali-swig/SWIG/events/popup-event.i [new file with mode: 0644]
plugins/dali-swig/SWIG/events/propertynotification-event.i [new file with mode: 0644]
plugins/dali-swig/SWIG/events/rendertask-event.i [new file with mode: 0644]
plugins/dali-swig/SWIG/events/resourceimage-event.i [new file with mode: 0644]
plugins/dali-swig/SWIG/events/scrollable-event.i [new file with mode: 0644]
plugins/dali-swig/SWIG/events/scrollbar-event.i [new file with mode: 0644]
plugins/dali-swig/SWIG/events/scrollview-event.i [new file with mode: 0644]
plugins/dali-swig/SWIG/events/slider-event.i [new file with mode: 0644]
plugins/dali-swig/SWIG/events/stage-event.i [new file with mode: 0644]
plugins/dali-swig/SWIG/events/stylemanager-event.i [new file with mode: 0644]
plugins/dali-swig/SWIG/events/tapgesture-event.i [new file with mode: 0644]
plugins/dali-swig/SWIG/events/texteditor-event.i [new file with mode: 0644]
plugins/dali-swig/SWIG/events/textfield-event.i [new file with mode: 0644]
plugins/dali-swig/SWIG/events/timer-event.i [new file with mode: 0644]
plugins/dali-swig/SWIG/events/videoview-event.i [new file with mode: 0644]
plugins/dali-swig/SWIG/signal-parameters.i [new file with mode: 0644]
plugins/dali-swig/SWIG/signals.i [new file with mode: 0644]
plugins/dali-swig/autogen.sh [new file with mode: 0755]
plugins/dali-swig/configure.ac [new file with mode: 0644]
plugins/dali-swig/constructor-generator.rb [new file with mode: 0755]
plugins/dali-swig/cpp/DaliWrapper.cpp [new file with mode: 0644]
plugins/dali-swig/cpp/DaliWrapper.h [new file with mode: 0644]
plugins/dali-swig/cpp/stdafx.h [new file with mode: 0644]
plugins/dali-swig/csharp/.gitignore [new file with mode: 0644]
plugins/dali-swig/examples/dali-test.cs [new file with mode: 0644]
plugins/dali-swig/examples/hello-world.cs [new file with mode: 0755]
plugins/dali-swig/examples/images/gallery-0.jpg [new file with mode: 0644]
plugins/dali-swig/examples/images/gallery-1.jpg [new file with mode: 0644]
plugins/dali-swig/examples/images/gallery-2.jpg [new file with mode: 0644]
plugins/dali-swig/examples/images/gallery-3.jpg [new file with mode: 0644]
plugins/dali-swig/examples/images/gallery-4.jpg [new file with mode: 0644]
plugins/dali-swig/examples/images/gallery-5.jpg [new file with mode: 0644]
plugins/dali-swig/examples/images/image-1.jpg [new file with mode: 0644]
plugins/dali-swig/examples/images/image-2.jpg [new file with mode: 0644]
plugins/dali-swig/examples/images/image-3.jpg [new file with mode: 0644]
plugins/dali-swig/examples/images/star-dim.png [new file with mode: 0644]
plugins/dali-swig/examples/images/star-highlight.png [new file with mode: 0644]
plugins/dali-swig/examples/scroll-view.cs [new file with mode: 0644]
plugins/dali-swig/property-wrapper.rb [new file with mode: 0755]
plugins/dali-swig/swig.cmd [new file with mode: 0644]