Sync to Ide90c579971eff165fe38694907a1092bd6c6fc4

    Supporting the 0x0 full size livebox.

    It is only supported for the commercialization feature.
    (Supporting the always livebox, 0 page of the homescreen)

Change-Id: I0970439aa1ce0e7d87712191243f4c2a588104f1

diff --git a/include/livebox-service.h b/include/livebox-service.h
index 5d5ebe8..0f4c337 100644 (file)
--- a/include/livebox-service.h
+++ b/include/livebox-service.h
@@ -21,7 +21,7 @@
 extern "C" {
 #endif
 
-#define NR_OF_SIZE_LIST 10
+#define NR_OF_SIZE_LIST 11
 
 enum livebox_size_type {
        LB_SIZE_TYPE_1x1 = 0x0001,
@@ -34,6 +34,7 @@ enum livebox_size_type {
        LB_SIZE_TYPE_EASY_1x1 = 0x0100,
        LB_SIZE_TYPE_EASY_3x1 = 0x0200,
        LB_SIZE_TYPE_EASY_3x3 = 0x0400,
+       LB_SIZE_TYPE_0x0 = 0x0800,
        LB_SIZE_TYPE_UNKNOWN = 0xFFFF,
 };
 

diff --git a/packaging/liblivebox-service.spec b/packaging/liblivebox-service.spec
index 96725b5..5adb084 100644 (file)
--- a/packaging/liblivebox-service.spec
+++ b/packaging/liblivebox-service.spec
@@ -1,6 +1,6 @@
 Name: liblivebox-service
 Summary: Service API for gathering installed livebox information.
-Version: 0.3.12
+Version: 0.4.0
 Release: 1
 Group: HomeTF/Livebox
 License: Flora License

diff --git a/src/livebox-service.c b/src/livebox-service.c
index 6cea99d..3e1ae97 100644 (file)
--- a/src/livebox-service.c
+++ b/src/livebox-service.c
@@ -60,6 +60,7 @@ static struct supported_size_list {
        { 207, 207 }, /*!< 21x21 */
        { 645, 207 }, /*!< 23x21 */
        { 645, 645 }, /*!< 23x23 */
+       { 720, 1280 }, /*!< 0x0 */
 };
 
 static struct info {
@@ -110,6 +111,9 @@ static inline int update_info(int width_type, int height_type, int width, int he
        } else if (width_type == 23 && height_type == 23) {
                DbgPrint("Easy 3x3 Updated to %dx%d\n", width, height);
                idx = 9;
+       } else if (width_type == 0 && height_type == 0) {
+               DbgPrint("Special 0x0 Updated to %dx%d\n", width, height);
+               idx = 10;
        } else {
                ErrPrint("Unknown size type: %dx%d (%dx%d)\n", width_type, height_type, width, height);
                return 0;
@@ -348,6 +352,9 @@ static inline int convert_size_from_type(enum livebox_size_type type, int *width
        case LB_SIZE_TYPE_EASY_3x3: /*!< 645x645 */
                idx = 9;
                break;
+       case LB_SIZE_TYPE_0x0: /*!< 720x1280 */
+               idx = 10;
+               break;
        default:
                return LB_STATUS_ERROR_INVALID;
        }
@@ -1942,6 +1949,8 @@ EAPI int livebox_service_size_type(int width, int height)
                return LB_SIZE_TYPE_EASY_3x1;
        case 9:
                return LB_SIZE_TYPE_EASY_3x3;
+       case 10:
+               return LB_SIZE_TYPE_0x0;
        default:
                break;
        }