From 273f15d6f5368a0144ea84cfdcf03f9d985106f5 Mon Sep 17 00:00:00 2001 From: Kazumasa Mitsunari Date: Mon, 7 May 2018 15:54:36 +0900 Subject: Add restriction and software keyboard layers Change-Id: I9133faa840f6feaec3f2b6f88a6e1b33be29639c Signed-off-by: Kazumasa Mitsunari --- src/layout_manager/db/layout.db | 114 +++++++++++++------------- src/layout_manager/db/layout.db.org | 158 ++++++++++++++++++++++++++++++++++++ src/layout_manager/layout.cpp | 3 + 3 files changed, 216 insertions(+), 59 deletions(-) create mode 100644 src/layout_manager/db/layout.db.org (limited to 'src/layout_manager') diff --git a/src/layout_manager/db/layout.db b/src/layout_manager/db/layout.db index c7cefd8..7955d96 100644 --- a/src/layout_manager/db/layout.db +++ b/src/layout_manager/db/layout.db @@ -1,17 +1,7 @@ { "layouts": [ { - "name": "pu", - "layer": "on_screen", - "areas": [ - { - "name": "pop_up", - "role": "incomming_call" - } - ] - }, - { - "name": "sa", + "name": "system_alert", "layer": "on_screen", "areas": [ { @@ -21,79 +11,49 @@ ] }, { - "name": "m1", - "layer": "apps", + "name": "restriction", + "layer": "restriction", "areas": [ { - "name": "normal", - "role": "map" + "name": "restriction", + "role": "restriction.video_hide_on_driving" } ] }, { - "name": "m2", - "layer": "apps", + "name": "upper_homescreen", + "layer": "upper_homescreen", "areas": [ { - "name": "split.main", - "role": "map" - }, - { - "name": "split.sub", - "category": "splitable" + "name": "software_keyboard", + "role": "software_keyboard" } ] }, { - "name": "mf", + "name": "applications", "layer": "apps", "areas": [ { - "name": "full", + "name": "normal", "role": "map" - } - ] - }, - { - "name": "s1", - "layer": "apps", - "areas": [ + }, { "name": "normal", - "category": "splitable" - } - ] - }, - { - "name": "s2", - "layer": "apps", - "areas": [ - { - "name": "split.main", - "category": "splitable" + "role": "map" }, - { - "name": "split.sub", - "category": "splitable" - } - ] - }, - { - "name": "g", - "layer": "apps", - "areas": [ { "name": "normal", - "category": "general" + "role": "map" } ] }, { - "name": "hs", - "layer": "homescreen", + "name": "lower_homescreen", + "layer": "lower_homescreen", "areas": [ { - "name": "full", + "name": "fullscreen", "role": "homescreen" } ] @@ -110,7 +70,16 @@ } }, { - "name": "split.main", + "name": "restriction.full", + "rect": { + "x": 0, + "y": 218, + "w": 1080, + "h": 1488 + } + }, + { + "name": "restriction.split.main", "rect": { "x": 0, "y": 218, @@ -118,6 +87,24 @@ "h": 744 } }, + { + "name": "restriction.split.sub", + "rect": { + "x": 0, + "y": 218, + "w": 1080, + "h": 1488 + } + }, + { + "name": "split.main", + "rect": { + "x": 0, + "y": 962, + "w": 1080, + "h": 744 + } + }, { "name": "split.sub", "rect": { @@ -128,7 +115,7 @@ } }, { - "name": "full", + "name": "fullscreen", "rect": { "x": 0, "y": 0, @@ -145,6 +132,15 @@ "h": 640 } }, + { + "name": "software_keyboard", + "rect": { + "x": 0, + "y": 1162, + "w": 1080, + "h": 544 + } + }, { "name": "system_alert", "rect": { diff --git a/src/layout_manager/db/layout.db.org b/src/layout_manager/db/layout.db.org new file mode 100644 index 0000000..c7cefd8 --- /dev/null +++ b/src/layout_manager/db/layout.db.org @@ -0,0 +1,158 @@ +{ + "layouts": [ + { + "name": "pu", + "layer": "on_screen", + "areas": [ + { + "name": "pop_up", + "role": "incomming_call" + } + ] + }, + { + "name": "sa", + "layer": "on_screen", + "areas": [ + { + "name": "system_alert", + "role": "system_alert" + } + ] + }, + { + "name": "m1", + "layer": "apps", + "areas": [ + { + "name": "normal", + "role": "map" + } + ] + }, + { + "name": "m2", + "layer": "apps", + "areas": [ + { + "name": "split.main", + "role": "map" + }, + { + "name": "split.sub", + "category": "splitable" + } + ] + }, + { + "name": "mf", + "layer": "apps", + "areas": [ + { + "name": "full", + "role": "map" + } + ] + }, + { + "name": "s1", + "layer": "apps", + "areas": [ + { + "name": "normal", + "category": "splitable" + } + ] + }, + { + "name": "s2", + "layer": "apps", + "areas": [ + { + "name": "split.main", + "category": "splitable" + }, + { + "name": "split.sub", + "category": "splitable" + } + ] + }, + { + "name": "g", + "layer": "apps", + "areas": [ + { + "name": "normal", + "category": "general" + } + ] + }, + { + "name": "hs", + "layer": "homescreen", + "areas": [ + { + "name": "full", + "role": "homescreen" + } + ] + } + ], + "areas": [ + { + "name": "normal", + "rect": { + "x": 0, + "y": 218, + "w": 1080, + "h": 1488 + } + }, + { + "name": "split.main", + "rect": { + "x": 0, + "y": 218, + "w": 1080, + "h": 744 + } + }, + { + "name": "split.sub", + "rect": { + "x": 0, + "y": 962, + "w": 1080, + "h": 744 + } + }, + { + "name": "full", + "rect": { + "x": 0, + "y": 0, + "w": 1080, + "h": 1920 + } + }, + { + "name": "pop_up", + "rect": { + "x": 0, + "y": 640, + "w": 1080, + "h": 640 + } + }, + { + "name": "system_alert", + "rect": { + "x": 0, + "y": 640, + "w": 1080, + "h": 640 + } + } + ] +} diff --git a/src/layout_manager/layout.cpp b/src/layout_manager/layout.cpp index dc73cbf..3f4013e 100644 --- a/src/layout_manager/layout.cpp +++ b/src/layout_manager/layout.cpp @@ -48,14 +48,17 @@ int LayoutManager::initialize() { this->prv_layers_["on_screen"] = layout; this->prv_layers_["apps"] = layout; this->prv_layers_["homescreen"] = layout; + this->prv_layers_["restriction"] = layout; this->crr_layers_["on_screen"] = layout; this->crr_layers_["apps"] = layout; this->crr_layers_["homescreen"] = layout; + this->crr_layers_["restriction"] = layout; this->prv_layers_car_stop_["on_screen"] = layout; this->prv_layers_car_stop_["apps"] = layout; this->prv_layers_car_stop_["homescreen"] = layout; + this->prv_layers_car_stop_["restriction"] = layout; return ret; } -- cgit 1.2.3-korg