From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Thu, 27 Jul 2017 08:56:30 +0000 (+0000)
Subject: Merge "Note that some Text propeties in devel api can't be changed" into devel/master
X-Git-Tag: dali_1.2.50~2
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=24d391fe222bd0fd5910e3b3481124fa23b796be;hp=b5967a328022a3d60e341feea6dfd27e42530690

Merge "Note that some Text propeties in devel api can't be changed" into devel/master
---

diff --git a/dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h b/dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h
index 50f6af5..3560363 100644
--- a/dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h
+++ b/dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h
@@ -78,30 +78,35 @@ namespace Property
       /**
        * @brief name "smoothScroll", type bool
        * @details Enable or disable the smooth scroll animation
+       * @note This property is currently being used for some applications, so it can't be changed.
        */
       SMOOTH_SCROLL = INPUT_OUTLINE + 1,
 
       /**
        * @brief name "smoothScrollDuration", type float
        * @details Sets the duration of smooth scroll animation
+       * @note This property is currently being used for some applications, so it can't be changed.
        */
       SMOOTH_SCROLL_DURATION,
 
       /**
        * @brief name "enableScrollBar", type bool
        * @details Enable or disable the scroll bar
+       * @note This property is currently being used for some applications, so it can't be changed.
        */
       ENABLE_SCROLL_BAR,
 
       /**
        * @brief name "scrollBarShowDuration", type float
        * @details Sets the duration of scroll bar to show
+       * @note This property is currently being used for some applications, so it can't be changed.
        */
       SCROLL_BAR_SHOW_DURATION,
 
       /**
        * @brief name "scrollBarFadeDuration", type float
        * @details Sets the duration of scroll bar to fade out
+       * @note This property is currently being used for some applications, so it can't be changed.
        */
       SCROLL_BAR_FADE_DURATION,
 
diff --git a/dali-toolkit/devel-api/controls/text-controls/text-field-devel.h b/dali-toolkit/devel-api/controls/text-controls/text-field-devel.h
index 9ff0b2c..bc199ad 100644
--- a/dali-toolkit/devel-api/controls/text-controls/text-field-devel.h
+++ b/dali-toolkit/devel-api/controls/text-controls/text-field-devel.h
@@ -86,6 +86,7 @@ namespace Property
        * @brief Hides the input characters and instead shows a default character for password or pin entry.
        * @details name "hiddenInputSettings", type map.
        * @note Optional.
+       *       This property is currently being used for some applications, so it can't be changed.
        * @see HiddenInput
        */
       HIDDEN_INPUT_SETTINGS = INPUT_OUTLINE + 1,