[TBT][3.0][WearableCircle][Config file change not checking circle resolution]

Change-Id: Ia83f04262425ac476b711d04160fad220c389a36
Signed-off-by: perforce <perforce@perforce.(none)>

diff --git a/release/binary-arm/org.tizen.tbtcoreapp-1.0.0-arm.tpk b/release/binary-arm/org.tizen.tbtcoreapp-1.0.0-arm.tpk
index ed77e001b7a23739615b618b18a8edc2afd4f975..dab1b09a3594a63d7e24af82499d662037649b9c 100644 (file)
Binary files a/release/binary-arm/org.tizen.tbtcoreapp-1.0.0-arm.tpk and b/release/binary-arm/org.tizen.tbtcoreapp-1.0.0-arm.tpk differ

diff --git a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-i386.tpk b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-i386.tpk
index f898d54499db941d969304203824795e47738675..e29f6eb1431bb668783aa7be9a306cd87b08f86d 100644 (file)
Binary files a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-i386.tpk and b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-i386.tpk differ

diff --git a/tbtcoreapp/inc/utils/config.h b/tbtcoreapp/inc/utils/config.h
index f641250f5863fac50f29445fd95ac0a840d82e3e..0a84f13f0272b47ce214952fe981e52c92e3e6cc 100644 (file)
--- a/tbtcoreapp/inc/utils/config.h
+++ b/tbtcoreapp/inc/utils/config.h
@@ -335,6 +335,7 @@ static inline char *format_string(const char *format, ...)
 static inline device_type_e get_device_type()
 {
        int  width, height;
+       bool is_circle = false;
        device_type_e device_type = DEVICE_NONE;
 
        if(device_width<0 && device_height<0)
@@ -342,10 +343,11 @@ static inline device_type_e get_device_type()
                system_info_get_platform_int("tizen.org/feature/screen.width", &device_width);
                system_info_get_platform_int("tizen.org/feature/screen.height", &device_height);
        }
+       system_info_get_platform_bool("tizen.org/feature/screen.shape.circle", &is_circle);
        width = device_width;
        height = device_height;
 
-       if(width == 360 && height == 360)
+       if((width == 360 && height == 360) || is_circle)
        {
                //circle
                device_type = DEVICE_WEARABLE_360_360;
@@ -366,7 +368,8 @@ static inline device_type_e get_device_type()
        {
                device_type = DEVICE_WEARABLE_320_320;
        }
-return device_type;
+
+       return device_type;
 
 }