t0lte: clean up device tree

Clean up overlays and cm.mk

Change-Id: I371505cbe4ba9ccbf2aac765f2ea1b4f13155df5
Signed-off-by: Ricky Salinas <rsalinas1@mail.usf.edu>

9 files changed, 6 insertions, 105 deletions

diff --git a/cm.mk b/cm.mk
index 701b5fe..dc512b1 100644
--- a/cm.mk
+++ b/cm.mk
@@ -1,6 +1,3 @@
-# Specify phone tech before including full_phone
-$(call inherit-product, vendor/cm/config/gsm.mk)
-
 # Release name
 PRODUCT_RELEASE_NAME := t0lte
 
@@ -8,12 +5,15 @@ PRODUCT_RELEASE_NAME := t0lte
 TARGET_SCREEN_HEIGHT := 1280
 TARGET_SCREEN_WIDTH := 720
 
-# Inherit some common CM stuff.
-$(call inherit-product, vendor/cm/config/common_full_phone.mk)
-
 # Inherit device configuration
 $(call inherit-product, device/samsung/t0lte/full_t0lte.mk)
 
+# Enhanced NFC
+$(call inherit-product, vendor/cm/config/nfc_enhanced.mk)
+
+# Inherit some common CM stuff.
+$(call inherit-product, vendor/cm/config/common_full_phone.mk)
+
 # Device identifier. This must come after all inclusions
 PRODUCT_DEVICE := t0lte
 PRODUCT_NAME := cm_t0lte
diff --git a/common.mk b/common.mk
index 8f3e983..ec02ef7 100644
--- a/common.mk
+++ b/common.mk
@@ -70,8 +70,6 @@ PRODUCT_PACKAGES += \
     Stk \
     SamsungServiceMode
 
-$(call inherit-product, vendor/cm/config/nfc_enhanced.mk)
-
 # RIL
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.telephony.ril_class=SamsungQualcommRIL \
diff --git a/overlay-cdma/frameworks/base/core/res/res/values/bools.xml b/overlay-cdma/frameworks/base/core/res/res/values/bools.xml
deleted file mode 100644
index e9cdf05..0000000
--- a/overlay-cdma/frameworks/base/core/res/res/values/bools.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2012 The CyanogenMod Project <http://www.cyanogenmod.org>
-
-     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 ">
-  <!-- <bool name="has_powercontrol_widget">true</bool> -->
-</resources>
diff --git a/overlay-cdma/frameworks/base/core/res/res/values/config.xml b/overlay-cdma/frameworks/base/core/res/res/values/config.xml
index 1643317..69a6ed1 100755
--- a/overlay-cdma/frameworks/base/core/res/res/values/config.xml
+++ b/overlay-cdma/frameworks/base/core/res/res/values/config.xml
@@ -165,12 +165,6 @@
     <!-- Allow the menu hard key to be disabled in LockScreen on some devices -->
     <bool name="config_disableMenuKeyInLockScreen">true</bool>
 
-    <!-- Disable the home key unlock setting -->
-    <!--<bool name="config_disableHomeUnlockSetting">false</bool>-->
-
-    <!-- Workaround for devices with broken keyboards -->
-    <!--<bool name="config_forceDisableHardwareKeyboard">true</bool>-->
-
     <!-- Hardware 'face' keys present on the device, stored as a bit field.
          This integer should equal the sum of the corresponding value for each
          of the following keys present:
diff --git a/overlay-cdma/packages/apps/Settings/res/values/bool.xml b/overlay-cdma/packages/apps/Settings/res/values/bools.xml
index aa21d11..aa21d11 100644
--- a/overlay-cdma/packages/apps/Settings/res/values/bool.xml
+++ b/overlay-cdma/packages/apps/Settings/res/values/bools.xml
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 1063740..0441b34 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -141,12 +141,6 @@
     <!-- Allow the menu hard key to be disabled in LockScreen on some devices -->
     <bool name="config_disableMenuKeyInLockScreen">true</bool>
 
-    <!-- Disable the home key unlock setting -->
-    <!--<bool name="config_disableHomeUnlockSetting">false</bool>-->
-
-    <!-- Workaround for devices with broken keyboards -->
-    <!--<bool name="config_forceDisableHardwareKeyboard">true</bool>-->
-
     <!-- Hardware 'face' keys present on the device, stored as a bit field.
          This integer should equal the sum of the corresponding value for each
          of the following keys present:
diff --git a/overlay/packages/apps/Camera2/res/values/config.xml b/overlay/packages/apps/Camera2/res/values/config.xml
deleted file mode 100644
index b442aa4..0000000
--- a/overlay/packages/apps/Camera2/res/values/config.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2011, 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>
-    <!-- Use ZSL mode for Qualcomm cameras -->
-    <bool name="enableZSL">true</bool>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values/bools.xml b/overlay/packages/apps/Settings/res/values/bools.xml
deleted file mode 100644
index 88338eb..0000000
--- a/overlay/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 <http://www.cyanogenmod.org>
-
-     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 the dock settings are to be displayed for this device when docked -->
-    <bool name="has_dock_settings">true</bool>
-</resources>
diff --git a/overlay/packages/apps/Settings/res/values/config.xml b/overlay/packages/apps/Settings/res/values/config.xml
deleted file mode 100644
index 89a117f..0000000
--- a/overlay/packages/apps/Settings/res/values/config.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 ">
-    <!-- Volume Rocker Wake -->
-    <bool name="config_show_volumeRockerWake">true</bool>
-</resources>