aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuta Doi <yuta-d@witz-inc.co.jp>2018-06-05 13:47:25 +0900
committerYuta Doi <yuta-d@witz-inc.co.jp>2018-06-05 13:47:25 +0900
commitd1fbf20ba98bcb935d75c7a13ab5d5b9450a7837 (patch)
treef6e3c020757965f2b5aa900671d078c28c7585c8
parent3271f0e36dab9e8b133d743299258a5ff7c92a7c (diff)
Add new roles and remove unnecessary role definition
Change-Id: I228ffab3810675789dc9cf90a0e4683466f79b2f Signed-off-by: Yuta Doi <yuta-d@witz-inc.co.jp>
-rw-r--r--layers.json6
-rw-r--r--src/db/app.db4
2 files changed, 3 insertions, 7 deletions
diff --git a/layers.json b/layers.json
index 7842589..94e34c4 100644
--- 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
--- a/src/db/app.db
+++ b/src/db/app.db
@@ -5,10 +5,6 @@
"role": "homescreen"
},
{
- "name": "Launcher",
- "role": "launcher"
- },
- {
"name": "Music",
"role": "music"
},