From cc3c6ddfed166c6fa024e1e288c7a0a85f8c6e58 Mon Sep 17 00:00:00 2001 From: Yuta Doi Date: Fri, 29 Jun 2018 20:30:29 +0900 Subject: [PATCH] Add new layers and rename existing layers Change-Id: I76f9ffd9acefaa35e2cfd00cc6c23037218fc103 Signed-off-by: Yuta Doi --- layers.json | 26 +++++++++++++++++++------- layers.json.split | 26 +++++++++++++++++++------- 2 files changed, 38 insertions(+), 14 deletions(-) diff --git a/layers.json b/layers.json index 263ab09..fddd258 100644 --- a/layers.json +++ b/layers.json @@ -11,25 +11,37 @@ "role": "BackGroundLayer", "name": "BackGroundLayer", "layer_id": 999, - "comment": "Single BackGround layer map for the Navigation, Radio and MediaPlayer" + "comment": "Single BackGround layer map for the map, radio, music and video" }, { "role": "homescreen", - "name": "HomeScreen", + "name": "FarHomeScreen", "layer_id": 1000, - "comment": "Single layer map for the HomeScreen" + "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", - "name": "apps", + "name": "Apps", "layer_id": 1001, - "comment": "Range of IDs that will always be placed on layer 1001, negative rect values are interpreted as output_size.dimension - $value" + "comment": "Range of IDs that will always be placed on layer 1001" + }, + { + "role": "software_keyboard", + "name": "NearHomeScreen", + "layer_id": 1002, + "comment": "NearHomeScreen is the part of HomeScreen. The z order of this layer is upper than FarHomeScreen" + }, + { + "role": "restriction", + "name": "Restriction", + "layer_id": 1003, + "comment": "This layer is for restriction notification. This is used by restriction role" }, { "role": "^on_screen.*", - "name": "popups", + "name": "OnScreen", "layer_id": 9999, - "comment": "Range of IDs that will always be placed on the popup layer, that gets a very high 'dummy' id of 9999" + "comment": "Range of IDs that will always be placed on the OnScreen layer, that gets a very high 'dummy' id of 9999" } ] } diff --git a/layers.json.split b/layers.json.split index 8115393..641e2f4 100644 --- a/layers.json.split +++ b/layers.json.split @@ -11,19 +11,19 @@ "role": "BackGroundLayer", "name": "BackGroundLayer", "layer_id": 999, - "comment": "Single BackGround layer map for the Navigation, Radio and MediaPlayer" + "comment": "Single BackGround layer map for the map, radio, music and video" }, { "role": "homescreen", - "name": "HomeScreen", + "name": "FarHomeScreen", "layer_id": 1000, - "comment": "Single layer map for the HomeScreen" + "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", - "name": "apps", + "name": "Apps", "layer_id": 1001, - "comment": "Range of IDs that will always be placed on layer 1001, negative rect values are interpreted as output_size.dimension - $value", + "comment": "Range of IDs that will always be placed on layer 1001", "split_layouts": [ { @@ -34,11 +34,23 @@ } ] }, + { + "role": "software_keyboard", + "name": "NearHomeScreen", + "layer_id": 1002, + "comment": "NearHomeScreen is the part of HomeScreen. The z order of this layer is upper than FarHomeScreen" + }, + { + "role": "restriction", + "name": "Restriction", + "layer_id": 1003, + "comment": "This layer is for restriction notification. This is used by restriction role" + }, { "role": "^on_screen.*", - "name": "popups", + "name": "OnScreen", "layer_id": 9999, - "comment": "Range of IDs that will always be placed on the popup layer, that gets a very high 'dummy' id of 9999" + "comment": "Range of IDs that will always be placed on the OnScreen layer, that gets a very high 'dummy' id of 9999" } ] } -- 2.16.6