X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=doc%2Fdali-toolkit-doc.h;h=b2bd7466fffd4cfa88e12df2462374703e70d152;hb=refs%2Fchanges%2F55%2F96355%2F2;hp=d390f9af668d1654026a30fe40dcee7df1b50bfd;hpb=8a28af5eb9edebeb36a7748420c560289930adef;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git
diff --git a/doc/dali-toolkit-doc.h b/doc/dali-toolkit-doc.h
index d390f9a..b2bd746 100644
--- a/doc/dali-toolkit-doc.h
+++ b/doc/dali-toolkit-doc.h
@@ -90,11 +90,11 @@
*
*
* @ref dali_toolkit_controls_scroll_bar |
- * ScrollBar control. |
+ * ScrollBar is a component that can be linked to the scrollable objects. |
*
*
* @ref dali_toolkit_controls_scrollable |
- * Scrollable container controls. |
+ * Scrollable contains scrolled controls. |
*
*
* @ref dali_toolkit_controls_item_view |
@@ -113,11 +113,39 @@
* Controls for displaying text or text input. |
*
*
+ * @ref dali_toolkit_controls_flex_container |
+ * FlexContainer is a container for Flexbox layout. |
+ *
+ *
+ * @ref dali_toolkit_controls_video_view |
+ * VideoView is a control for video playback and display. |
+ *
+ *
+ * @ref dali_toolkit_controls_slider |
+ * Slider is a control to enable sliding an indicator between two values. |
+ *
+ *
* @ref dali_toolkit_managers |
* Singleton classes for managing application-wide functionalities. |
*
*
*
+ * \ifnot show_tizen_feature
+ *
+ * @section dali_toolkit_feature Related Features
+ * This API is related with the following features:\n
+ * - http://tizen.org/feature/opengles.version.2_0\n
+ *
+ * It is recommended to design feature related codes in your application for reliability.\n
+ *
+ * You can check if a device supports the related features for this API by using @ref CAPI_SYSTEM_SYSTEM_INFO_MODULE, thereby controlling the procedure of your application.\n
+ *
+ * To ensure your application is only running on the device with specific features, please define the features in your manifest file using the manifest editor in the SDK.\n
+ *
+ * More details on featuring your application can be found from Feature Element.
+ *
+ * \endif
+ *
* @ingroup dali
* @{
* @defgroup dali_toolkit_controls Controls
@@ -137,10 +165,10 @@
* @brief ImageView is a control displying an image.
* @defgroup dali_toolkit_controls_scroll_bar Scroll Bar
- * @brief ScrollBar control.
+ * @brief ScrollBar is a component that can be linked to the scrollable objects.
* @defgroup dali_toolkit_controls_scrollable Scrollable
- * @brief Scrollable container controls.
+ * @brief Scrollable contains scrolled controls.
* @{
* @defgroup dali_toolkit_controls_item_view Item View
@@ -159,6 +187,12 @@
* @defgroup dali_toolkit_controls_flex_container Flex Container
* @brief FlexContainer is a container for Flexbox layout.
+ * @defgroup dali_toolkit_controls_video_view Video View
+ * @brief VideoView is a control for video playback and display.
+
+ * @defgroup dali_toolkit_controls_slider Slider
+ * @brief Slider is a control to enable sliding an indicator between two values.
+
* @}
* @defgroup dali_toolkit_managers Managers