[dali_1.0.45] Merge branch 'devel/master'

[platform/core/uifw/dali-demo.git] / com.samsung.dali-demo.xml

diff --git a/com.samsung.dali-demo.xml b/com.samsung.dali-demo.xml
index c68fba7..fd65a57 100644 (file)
--- a/com.samsung.dali-demo.xml
+++ b/com.samsung.dali-demo.xml
@@ -53,8 +53,8 @@
                <label>Refraction effect</label>
        </ui-application>
        <ui-application appid="scripting.example" exec="/usr/apps/com.samsung.dali-demo/bin/scripting.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
-    <label>Scroll View</label>
-  </ui-application>
+               <label>Scroll View</label>
+       </ui-application>
        <ui-application appid="scroll-view.example" exec="/usr/apps/com.samsung.dali-demo/bin/scroll-view.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
                <label>Scroll View</label>
        </ui-application>
@@ -67,8 +67,11 @@
        <ui-application appid="builder.example" exec="/usr/apps/com.samsung.dali-demo/bin/builder.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
                <label>Script Based UI</label>
        </ui-application>
+       <ui-application appid="image-scaling-and-filtering.example" exec="/usr/apps/com.samsung.dali-demo/bin/image-scaling-and-filtering.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
+               <label>Image Fitting and Sampling</label>
+       </ui-application>
        <ui-application appid="image-scaling-irregular-grid.example" exec="/usr/apps/com.samsung.dali-demo/bin/image-scaling-irregular-grid.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
-               <label>Image Scaling Modes</label>
+               <label>Image Scaling Grid</label>
        </ui-application>
        <ui-application appid="buttons.example" exec="/usr/apps/com.samsung.dali-demo/bin/buttons.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
                <label>Buttons</label>
@@ -83,7 +86,7 @@
                <label>Emojis Text Label</label>
        </ui-application>
        <ui-application appid="text-field.example" exec="/usr/apps/com.samsung.dali-demo/bin/text-field.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
-               <label>Text Label</label>
+               <label>Text Field</label>
        </ui-application>
        <ui-application appid="text-message-field.example" exec="/usr/apps/com.samsung.dali-demo/bin/text-message-field.example" nodisplay="true" multiple="false" type="c++app" taskmanage="true">
                <label>Text Label</label>