Merge "Remove prebuilt SamsungServiceMode and common_sgs.mk. Overlays need to be set per device basis." into jb4.3
diff --git a/config/common_sgs.mk b/config/common_sgs.mk
deleted file mode 100644
index 93735eb..0000000
--- a/config/common_sgs.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-#Device Settings for Samsung Galaxy phones
-PRODUCT_PACKAGE_OVERLAYS += vendor/slim/overlay/sgs
-
-#samsung service mode for device settings
-PRODUCT_COPY_FILES += \
- vendor/slim/prebuilt/common/app/SamsungServiceMode.apk:system/app/SamsungServiceMode.apk
diff --git a/overlay/sgs/frameworks/base/core/res/res/values/config.xml b/overlay/sgs/frameworks/base/core/res/res/values/config.xml
deleted file mode 100644
index 213b8cd..0000000
--- a/overlay/sgs/frameworks/base/core/res/res/values/config.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- Disable the home key unlock setting -->
- <bool name="config_disableHomeUnlockSetting">false</bool>
-
- <!-- Workaround for devices with broken keyboards -->
- <bool name="config_forceDisableHardwareKeyboard">true</bool>
-
- <!-- Boolean to enable stk functionality on Samsung phones -->
- <bool name="config_samsung_stk">true</bool>
-
- <!-- Boolean to force HW Rotation Lock -->
- <bool name="config_hasRotationLockSwitch">false</bool>
-
-</resources>
-
diff --git a/overlay/sgs/packages/apps/Settings/res/values/bools.xml b/overlay/sgs/packages/apps/Settings/res/values/bools.xml
deleted file mode 100644
index 9e30f1e..0000000
--- a/overlay/sgs/packages/apps/Settings/res/values/bools.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2012 The CyanogenMod Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<resources xmlns:xliff="urnasis:names:tc:xliff:document:1.2 ">
- <!-- Whether or not device settings should be displayed or not for the device -->
- <bool name="has_advanced_settings">true</bool>
-</resources>
diff --git a/prebuilt/common/app/SamsungServiceMode.apk b/prebuilt/common/app/SamsungServiceMode.apk
deleted file mode 100644
index 37ab5e9..0000000
--- a/prebuilt/common/app/SamsungServiceMode.apk
+++ /dev/null
Binary files differ