Fixed sliders end on screen edge

Fixes issues: TSAM-10767, TSAM-10755, TSAM-10751

Change-Id: Iab04ff795172ec2a8633d37550c468e0419452c6
Signed-off-by: Bartlomiej Uliasz <b.uliasz@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 43ddc453f6967cbdc0e9dbfc5425d7cd89ceffe7..e08f94696769f7f011d5f767c3383cb0bb9a7b27 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -87,24 +87,24 @@ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/src/setting-common-internal.pc.in ${CMAKE_SOU
 ADD_SUBDIRECTORY(src)
 
 # all UGs for Setting itself
-ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_STORAGE})
-ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_LANGUAGE_AND_INPUT})
-ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_LICENSE})
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_ABOUT})
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_ACCESSIBILITY})
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_APPLICATIONS})
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_APPMGR})
 ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_CONNECTIVITY})
 ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_DISPLAY})
-ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_NETWORK})
-ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_APPLICATIONS})
-ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_PROFILE})
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_FILEVIEW})
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_FLIGHTMODE})
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_FONT})
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_LANGUAGE_AND_INPUT})
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_LICENSE})
 ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_LOCKTYPE})
-ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_TIME})
-ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_ABOUT})
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_NETWORK})
 ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_PASSWORD})
-ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_FONT})
-ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_FILEVIEW})
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_PRIVACY})
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_PROFILE})
 ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_RINGTONE})
-ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_APPMGR})
-ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_FLIGHTMODE})
-ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_ACCESSIBILITY})
 ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_SMARTMANAGER})
-ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_PRIVACY})
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_STORAGE})
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_TIME})
 

diff --git a/resource/setting-theme.edc b/resource/setting-theme.edc
index 68b1ebe54fcdf895c6c3aab7c320ca01d8d9cd8e..bc4a3257410a40955bc4edbff000aa703903d544 100644 (file)
--- a/resource/setting-theme.edc
+++ b/resource/setting-theme.edc
@@ -11376,7 +11376,11 @@ collections
                                        rel1
                                        {       to: "text_content_padding"; relative: 0.0 1.0;}
                                        rel2
-                                       {       to: "bottom_padding"; relative: 1.0 0.0;}
+                                       {       to_y: "bottom_padding";
+                                               to_x: "right_padding";
+                                               relative: 0.0 0.0;
+
+                                       }
                                }
                        }
                        part