P51XX: rework overlay

Split CM and AOSP specific overlay

Change-Id: I55e5b2fe359e202b1ec65bc77316629309b68fa4

17 files changed, 109 insertions, 70 deletions

diff --git a/cm.mk b/cm.mk
index a2fd638..498ffb7 100644
--- a/cm.mk
+++ b/cm.mk
@@ -28,6 +28,10 @@ $(call inherit-product, vendor/cm/config/common_full_phone.mk)
 # Inherit device configuration
 $(call inherit-product, device/samsung/p5100/full_p5100.mk)
 
+# CyanogenMod specific overlay
+DEVICE_PACKAGE_OVERLAYS += device/samsung/p5100/overlay/cm
+DEVICE_PACKAGE_OVERLAYS += device/samsung/p5100/overlay/cm-common
+
 ## Device identifier. This must come after all inclusions
 PRODUCT_DEVICE := p5100
 PRODUCT_NAME := cm_p5100
diff --git a/common-overlay/frameworks/base/core/res/res/values-large/config.xml b/overlay/aosp-common/frameworks/base/core/res/res/values-large/config.xml
index 27d1d32..f37c798 100644
--- a/common-overlay/frameworks/base/core/res/res/values-large/config.xml
+++ b/overlay/aosp-common/frameworks/base/core/res/res/values-large/config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 /*
-** Copyright 2011, The Android Open Source Project
+** Copyright 2009, The Android Open Source Project
 **
 ** Licensed under the Apache License, Version 2.0 (the "License");
 ** you may not use this file except in compliance with the License.
@@ -16,9 +16,8 @@
 ** limitations under the License.
 */
 -->
-
 <!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
+     for different hardware and product builds.  Do not translate. -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <integer name="config_longPressOnPowerBehavior">1</integer>
 </resources>
diff --git a/common-overlay/frameworks/base/core/res/res/values-sw600dp/config.xml b/overlay/aosp-common/frameworks/base/core/res/res/values-sw600dp/config.xml
index 27d1d32..f37c798 100644
--- a/common-overlay/frameworks/base/core/res/res/values-sw600dp/config.xml
+++ b/overlay/aosp-common/frameworks/base/core/res/res/values-sw600dp/config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 /*
-** Copyright 2011, The Android Open Source Project
+** Copyright 2009, The Android Open Source Project
 **
 ** Licensed under the Apache License, Version 2.0 (the "License");
 ** you may not use this file except in compliance with the License.
@@ -16,9 +16,8 @@
 ** limitations under the License.
 */
 -->
-
 <!-- These resources are around just to allow their values to be customized
-     for different hardware and product builds. -->
-<resources>
+     for different hardware and product builds.  Do not translate. -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <integer name="config_longPressOnPowerBehavior">1</integer>
 </resources>
diff --git a/common-overlay/frameworks/base/core/res/res/values/config.xml b/overlay/aosp-common/frameworks/base/core/res/res/values/config.xml
index 48e3fd3..673a541 100644
--- a/common-overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/aosp-common/frameworks/base/core/res/res/values/config.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-/* Copyright (c) 2013, The Linux Foundation. All rights reserved.
-** Not a Contribution.
-**
+/*
 ** Copyright 2009, The Android Open Source Project
 **
 ** Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,6 +16,7 @@
 ** limitations under the License.
 */
 -->
+
 <!-- These resources are around just to allow their values to be customized
      for different hardware and product builds.  Do not translate. -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
@@ -94,34 +93,6 @@
         <item>50</item>
     </integer-array>
 
-    <!-- Hardware keys present on the device, stored as a bit field.
-s         This integer should equal the sum of the corresponding value for each
-         of the following keys present:
-             1 - Home
-             2 - Back
-             4 - Menu
-             8 - Assistant (search)
-            16 - App switch
-            32 - Camera
-            64 - Volume rocker
-         For example, a device with Home, Back and Menu keys would set this
-         config to 7. -->
-    <integer name="config_deviceHardwareKeys">64</integer>
-
-    <!-- Hardware keys present on the device with the ability to wake, stored as a bit field.
-         This integer should equal the sum of the corresponding value for each
-         of the following keys present:
-             1 - Home
-             2 - Back
-             4 - Menu
-             8 - Assistant (search)
-            16 - App switch
-            32 - Camera
-            64 - Volume rocker
-         For example, a device with Home, Back and Menu keys would set this
-         config to 7. -->
-    <integer name="config_deviceHardwareWakeKeys">64</integer>
-
     <!-- Screen brightness used to dim the screen when the user activity
          timeout expires.  May be less than the minimum allowed brightness setting
          that can be set by the user. -->
@@ -273,11 +244,6 @@ s         This integer should equal the sum of the corresponding value for each
 
     <!--  Maximum number of supported users -->
     <integer name="config_multiuserMaximumUsers">5</integer>
-
     <!-- Whether UI for multi user should be shown -->
     <bool name="config_enableMultiUserUI">true</bool>
-
-    <!-- Is the device LTE capable -->
-    <bool name="config_lte_capable">false</bool>
-
 </resources>
diff --git a/common-overlay/frameworks/base/core/res/res/xml/power_profile.xml b/overlay/aosp-common/frameworks/base/core/res/res/xml/power_profile.xml
index 8dc8f8f..8dc8f8f 100644
--- a/common-overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/overlay/aosp-common/frameworks/base/core/res/res/xml/power_profile.xml
diff --git a/common-overlay/frameworks/base/core/res/res/xml/storage_list.xml b/overlay/aosp-common/frameworks/base/core/res/res/xml/storage_list.xml
index b96131a..b96131a 100644
--- a/common-overlay/frameworks/base/core/res/res/xml/storage_list.xml
+++ b/overlay/aosp-common/frameworks/base/core/res/res/xml/storage_list.xml
diff --git a/common-overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/overlay/aosp-common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
index ba79867..ba79867 100644
--- a/common-overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
+++ b/overlay/aosp-common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
diff --git a/common-overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/overlay/aosp-common/frameworks/base/packages/SystemUI/res/values/config.xml
index 28c2362..3a891ca 100644
--- a/common-overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/overlay/aosp-common/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -3,20 +3,19 @@
 /*
 ** Copyright 2009, The Android Open Source 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 
+** 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 
+**     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 
+** 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.
 */
 -->
-
 <!-- These resources are around just to allow their values to be customized
      for different hardware and product builds. -->
 <resources>
diff --git a/common-overlay/packages/apps/Settings/res/values/bools.xml b/overlay/aosp-common/packages/apps/Settings/res/values/bools.xml
index f649186..f649186 100644
--- a/common-overlay/packages/apps/Settings/res/values/bools.xml
+++ b/overlay/aosp-common/packages/apps/Settings/res/values/bools.xml
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/aosp/frameworks/base/core/res/res/values/config.xml
index e66588c..185ec3f 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/aosp/frameworks/base/core/res/res/values/config.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-/* Copyright (c) 2013, The Linux Foundation. All rights reserved.
-** Not a Contribution.
-**
+/*
 ** Copyright 2009, The Android Open Source Project
 **
 ** Licensed under the Apache License, Version 2.0 (the "License");
@@ -60,8 +58,4 @@
 
     <!-- The default iface on which to monitor data use -->
     <string name="config_datause_iface">pdp0</string>
-
-    <!-- Boolean to enable stk functionality on Samsung phones -->
-    <bool name="config_samsung_stk">true</bool>
-
 </resources>
diff --git a/overlay/packages/apps/Mms/res/xml/mms_config.xml b/overlay/aosp/packages/apps/Mms/res/xml/mms_config.xml
index ec35a20..f37922e 100644
--- a/overlay/packages/apps/Mms/res/xml/mms_config.xml
+++ b/overlay/aosp/packages/apps/Mms/res/xml/mms_config.xml
@@ -32,19 +32,15 @@
     <!-- Maximum width for an attached image -->
     <int name="maxImageWidth">1600</int>
 
-    <!-- User-Agent parameter used in MMS http request -->
-    <string name="userAgent">SAMSUNG-GT-P5100-Mms</string>
+    <!-- UAProf URL -->
+    <string name="uaProfUrl">http://wap.samsungmobile.com/uaprof/GT-P5100.xml</string>
 
     <!-- If true, The text message over 160 characters will be sent in multi part.
          If false, The text message over 160 characters will be sent
          via multi media message. -->
     <bool name="enableMultipartSMS">true</bool>
 
-    <!-- If true, the text message will be split every 160 characters.
-         If false, the text will never be split before being sent. -->
-    <bool name="enableSplitSMS">false</bool>
-
-    <!-- UAProf URL -->
-    <string name="uaProfUrl">http://wap.samsungmobile.com/uaprof/GT-P5100.xml</string>
+    <!-- User-Agent parameter used in MMS http request -->
+    <string name="userAgent">SAMSUNG-GT-P5100-Mms</string>
 
 </mms_config>
diff --git a/overlay/packages/services/Telephony/res/values/config.xml b/overlay/aosp/packages/services/Telephony/res/values/config.xml
index 230794e..230794e 100644
--- a/overlay/packages/services/Telephony/res/values/config.xml
+++ b/overlay/aosp/packages/services/Telephony/res/values/config.xml
diff --git a/common-overlay/frameworks/base/core/res/res/values/cm_arrays.xml b/overlay/cm-common/frameworks/base/core/res/res/values/cm_arrays.xml
index 16ef3c0..16ef3c0 100644
--- a/common-overlay/frameworks/base/core/res/res/values/cm_arrays.xml
+++ b/overlay/cm-common/frameworks/base/core/res/res/values/cm_arrays.xml
diff --git a/overlay/cm-common/frameworks/base/core/res/res/values/config.xml b/overlay/cm-common/frameworks/base/core/res/res/values/config.xml
new file mode 100644
index 0000000..4b7dfa3
--- /dev/null
+++ b/overlay/cm-common/frameworks/base/core/res/res/values/config.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source 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.
+*/
+-->
+
+<!-- These resources are around just to allow their values to be customized
+     for different hardware and product builds.  Do not translate. -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- Hardware 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:
+             1 - Home
+             2 - Back
+             4 - Menu
+             8 - Assistant (search)
+            16 - App switch
+            32 - Camera
+            64 - Volume rocker
+         For example, a device with Home, Back and Menu keys would set this
+         config to 7. -->
+    <integer name="config_deviceHardwareKeys">64</integer>
+
+    <!-- Hardware keys present on the device with the ability to wake, stored as a bit field.
+         This integer should equal the sum of the corresponding value for each
+         of the following keys present:
+             1 - Home
+             2 - Back
+             4 - Menu
+             8 - Assistant (search)
+            16 - App switch
+            32 - Camera
+            64 - Volume rocker
+         For example, a device with Home, Back and Menu keys would set this
+         config to 7. -->
+    <integer name="config_deviceHardwareWakeKeys">64</integer>
+
+    <!-- Is the device LTE capable -->
+    <bool name="config_lte_capable">false</bool>
+
+</resources>
diff --git a/overlay/cm/frameworks/base/core/res/res/values/config.xml b/overlay/cm/frameworks/base/core/res/res/values/config.xml
new file mode 100644
index 0000000..1375d9f
--- /dev/null
+++ b/overlay/cm/frameworks/base/core/res/res/values/config.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2009, The Android Open Source 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.
+*/
+-->
+
+<!-- These resources are around just to allow their values to be customized
+     for different hardware and product builds.  Do not translate. -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- Boolean to enable stk functionality on Samsung phones -->
+    <bool name="config_samsung_stk">true</bool>
+
+</resources>
diff --git a/p5100.mk b/p5100.mk
index bb93b70..cd499b7 100644
--- a/p5100.mk
+++ b/p5100.mk
@@ -18,7 +18,7 @@ $(call inherit-product, device/samsung/p5100/p51xx-common.mk)
 
 LOCAL_PATH := device/samsung/p5100
 
-DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
+DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay/aosp
 
 # Audio
 PRODUCT_COPY_FILES += \
diff --git a/p51xx-common.mk b/p51xx-common.mk
index 3af5b57..8e259ac 100755
--- a/p51xx-common.mk
+++ b/p51xx-common.mk
@@ -17,7 +17,7 @@
 # Include omap4 common makefile
 $(call inherit-product, device/samsung/omap4-common/common.mk)
 
-DEVICE_PACKAGE_OVERLAYS += device/samsung/p5100/common-overlay
+DEVICE_PACKAGE_OVERLAYS += device/samsung/p5100/overlay/aosp-common
 
 $(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk)