Removed screen resolution dependent main_entry definitions 82/105182/1
authorJi-hoon Lee <dalton.lee@samsung.com>
Fri, 16 Dec 2016 02:03:24 +0000 (11:03 +0900)
committerJi-hoon Lee <dalton.lee@samsung.com>
Fri, 16 Dec 2016 02:28:26 +0000 (11:28 +0900)
Change-Id: I01113678bfc44a9f3bc3c026117a288527f8eebc

src/include/ise.h
src/ise.cpp

index 30db1c0..fafd0b9 100644 (file)
 #ifdef _TV
 #define MAIN_ENTRY_XML_PATH LAYOUTDIR"/tv/main_entry.xml"
 #elif _WEARABLE
-#define MAIN_ENTRY_XML_PATH_720X1280   LAYOUTDIR"/wearable/main_entry.xml"
-#define MAIN_ENTRY_XML_PATH MAIN_ENTRY_XML_PATH_720X1280
+#define MAIN_ENTRY_XML_PATH_LAYOUTDIR"/wearable/main_entry.xml"
 #else
-#define MAIN_ENTRY_XML_PATH_480X800    LAYOUTDIR"/mobile/main_entry_480x800.xml"
-#define MAIN_ENTRY_XML_PATH_540X960    LAYOUTDIR"/mobile/main_entry_540x960.xml"
-#define MAIN_ENTRY_XML_PATH_720X1280   LAYOUTDIR"/mobile/main_entry.xml"
-#define MAIN_ENTRY_XML_PATH_1440X2560  LAYOUTDIR"/mobile/main_entry_1440x2560.xml"
-#define MAIN_ENTRY_XML_PATH MAIN_ENTRY_XML_PATH_720X1280
+#define MAIN_ENTRY_XML_PATH LAYOUTDIR"/mobile/main_entry.xml"
 #endif
 
 #define DEFAULT_KEYBOARD_ISE_UUID "org.tizen.ise-engine-default"
index ceadc3d..0e6a763 100644 (file)
@@ -1665,15 +1665,6 @@ ise_create()
             if (utils) {
                 utils->get_screen_resolution(&nwidth, &nheight);
             }
-#ifdef _MOBILE
-            if ((480 == nwidth) && (800 == nheight)) {
-                entry_path = MAIN_ENTRY_XML_PATH_480X800;
-            } else if ((540 == nwidth) && (960 == nheight)) {
-                entry_path = MAIN_ENTRY_XML_PATH_540X960;
-            } else if ((1440 == nwidth) && (2560 == nheight)) {
-                entry_path = MAIN_ENTRY_XML_PATH_1440X2560;
-            }
-#endif
             _language_manager.set_resource_file_path(entry_path);
             const sclchar *resource_file_path = _language_manager.get_resource_file_path();