From bfaca7514c709e818aa9f7eaa7ebb590e5166733 Mon Sep 17 00:00:00 2001
From: wang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com>
Date: Sat, 25 May 2019 09:21:23 +0800
Subject: [PATCH] rm lastmode

Change-Id: Ide060be2a78d25c8ce74decc57e2f6ef5f89a67e
---
 conf/hs-conf.json  | 9 ---------
 conf/lastmode.json | 6 ------
 src/CMakeLists.txt | 3 +--
 3 files changed, 1 insertion(+), 17 deletions(-)
 delete mode 100644 conf/lastmode.json

diff --git a/conf/hs-conf.json b/conf/hs-conf.json
index 0c01ebd..aa0a1ec 100644
--- a/conf/hs-conf.json
+++ b/conf/hs-conf.json
@@ -24,17 +24,8 @@
 			}
 		],
 		"default-lastmode": [
-			{
-				"appid": "launcher",
-				"visibility": "visible",
-				"after": "homescreen"
-			}
 		],
 		"normal-apps": [
-			{
-				"appid": "warehouse",
-				"visibility": "invisible"
-			}
 		]
 	}
 }
\ No newline at end of file
diff --git a/conf/lastmode.json b/conf/lastmode.json
deleted file mode 100644
index 68ea81f..0000000
--- a/conf/lastmode.json
+++ /dev/null
@@ -1,6 +0,0 @@
-[
-	{
-		"appid": "phone",
-		"visibility": "visible"
-	}
-]
\ No newline at end of file
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6baa3b3..21cbf49 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -67,8 +67,7 @@ add_custom_command(TARGET ${TARGETS_HSBINDER} POST_BUILD
     COMMAND mkdir -p ${PROJECT_BINARY_DIR}/package/root/lib
     COMMAND cp -rf ${PROJECT_BINARY_DIR}/src/${TARGETS_HSBINDER}.so ${PROJECT_BINARY_DIR}/package/root/lib
     COMMAND mkdir -p ${PROJECT_BINARY_DIR}/package/root/etc
-    COMMAND cp -f ${CMAKE_SOURCE_DIR}/conf/hs-conf.json ${PROJECT_BINARY_DIR}/package/root/etc
-    COMMAND cp -f ${CMAKE_SOURCE_DIR}/conf/lastmode.json ${PROJECT_BINARY_DIR}/package/root/etc
+    COMMAND cp -f ${CMAKE_SOURCE_DIR}/conf/*.json ${PROJECT_BINARY_DIR}/package/root/etc
 )
 
 add_custom_target(package DEPENDS ${PROJECT_BINARY_DIR}/package/root
-- 
2.16.6