From 350e143976e12f152304830fdca69f31567d4fa2 Mon Sep 17 00:00:00 2001
From: zheng_wenlong <wenlong_zheng@nexty-ele.com>
Date: Wed, 10 Oct 2018 10:51:04 +0900
Subject: [PATCH] change to 24x9 layouts

---
 layers.json     | 13 +++++++++++--
 src/db/areas.db | 34 +++++++++++++++++-----------------
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/layers.json b/layers.json
index 97599a3..2e9f2f1 100644
--- a/layers.json
+++ b/layers.json
@@ -20,10 +20,19 @@
          "comment": "FarHomeScreen is the part of HomeScreen. The z order of this layer is lower than NearHomeScreen"
       },
       {
-         "role": "music|video|browser|radio|phone|map|hvac|settings|dashboard|poi|mixer|sdl|launcher|fallback",
+         "role": "music|video|browser|radio|phone|map|hvac|settings|dashboard|poi|mixer|sdl|onstestapp|launcher|tachometer|warehouse|tbtnavi|fallback",
          "name": "Apps",
          "layer_id": 1001,
-         "comment": "Range of IDs that will always be placed on layer 1001"
+         "comment": "Range of IDs that will always be placed on layer 1001",
+
+         "split_layouts": [
+            {
+               "name": "tachometer",
+	       "main_match": "tachometer",
+	       "sub_match": "warehouse|tbtnavi",
+	       "priority": 1000
+	    }
+	 ]
       },
       {
         "role": "homescreen",
diff --git a/src/db/areas.db b/src/db/areas.db
index a8039fa..368b954 100644
--- a/src/db/areas.db
+++ b/src/db/areas.db
@@ -6,7 +6,7 @@
                 "x": 0,
                 "y": 0,
                 "w": 1920,
-                "h": 1080
+                "h": 720
             }
         },
         {
@@ -15,25 +15,25 @@
                 "x": 0,
                 "y": 0,
                 "w": 1920,
-                "h": 1080
+                "h": 720
             }
         },
         {
             "name": "split.main",
             "rect": {
-                "x": 0,
+                "x": 640,
                 "y": 0,
-                "w": 1920,
-                "h": 540
+                "w": 1280,
+                "h": 720
             }
         },
         {
             "name": "split.sub",
             "rect": {
                 "x": 0,
-                "y": 540,
-                "w": 1920,
-                "h": 540
+                "y": 0,
+                "w": 640,
+                "h": 720
             }
         },
         {
@@ -42,7 +42,7 @@
                 "x": 0,
                 "y": 0,
                 "w": 1920,
-                "h": 1080
+                "h": 720
             }
         },
         {
@@ -51,25 +51,25 @@
                 "x": 0,
                 "y": 0,
                 "w": 1920,
-                "h": 1808
+                "h": 720
             }
         },
         {
             "name": "restriction.split.main",
             "rect": {
-                "x": 0,
+                "x": 640,
                 "y": 0,
-                "w": 1920,
-                "h": 540
+                "w": 1280,
+                "h": 720
             }
         },
         {
             "name": "restriction.split.sub",
             "rect": {
                 "x": 0,
-                "y": 540,
-                "w": 1920,
-                "h": 540
+                "y": 0,
+                "w": 640,
+                "h": 720
             }
         },
         {
@@ -78,7 +78,7 @@
                 "x": 0,
                 "y": 0,
                 "w": 1920,
-                "h": 1080
+                "h": 720
             }
         }
     ]
-- 
2.16.6