Add new roles and remove unnecessary role definition

Change-Id: I228ffab3810675789dc9cf90a0e4683466f79b2f
Signed-off-by: Yuta Doi <yuta-d@witz-inc.co.jp>

diff --git a/layers.json b/layers.json
index 7842589..94e34c4 100644 (file)
--- a/layers.json
+++ b/layers.json
@@ -22,14 +22,14 @@
          "comment": "FarHomeScreen is the part of HomeScreen, and lawer layer of z order for HomeScreen"
       },
       {
-         "role": "Launcher|Music|Video|WebBrowser|MediaPlayer|Radio|Phone|Navigation|HVAC|Settings|Dashboard|POI|Mixer|Fallback|launcher|music|video|browser|radio|phone|map|hvac|settings|dashboard|poi|fallback",
+         "role": "Music|Video|WebBrowser|MediaPlayer|Radio|Phone|Navigation|HVAC|Settings|Dashboard|POI|Mixer|Fallback|launcher|music|video|browser|radio|phone|map|hvac|settings|dashboard|poi|mixer|sdl|fallback",
          "name": "apps",
          "layer_id": 1001,
          "area": { "type": "rect", "rect": { "x": 0, "y": 218, "width": -1, "height": -433 } },
          "comment": "Range of IDs that will always be placed on layer 1001, negative rect values are interpreted as output_size.dimension - $value"
       },
       {
-        "role": "SoftwareKeyboard",
+        "role": "software_keyboard",
         "name": "NearHomeScreen",
         "layer_id": 1002,
         "area": { "type": "rect", "rect": { "x": 0, "y": 760, "width": -1, "height": -1 } },
@@ -43,7 +43,7 @@
         "comment": "This layer is for restriction notification. This is used by restriction role"
       },
       {
-         "role": "^OnScreen.*",
+         "role": "^OnScreen.*|on_screen.*",
          "name": "popups",
          "layer_id": 9999,
          "area": { "type": "rect", "rect": { "x": 0, "y": 760, "width": -1, "height": 400 } },

diff --git a/src/db/app.db b/src/db/app.db
index cdc2da8..7ec632b 100644 (file)
--- a/src/db/app.db
+++ b/src/db/app.db
@@ -4,10 +4,6 @@
             "name": "HomeScreen",
             "role": "homescreen"
         },
-        {
-            "name": "Launcher",
-            "role": "launcher"
-        },
         {
             "name": "Music",
             "role": "music"