reorganization

- all AOKP customizations for device trees *should* be done here, especially overlays
- moved common_ files to configs folder
- removed some unnessecary files

products/common.mk → configs/common.mk

@@ -48,3 +48,5 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
     frameworks/base/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml
 
+# Inherit common build.prop overrides
+-include vendor/aokp/configs/common_versions.mk

products/common_phone.mk → configs/common_phone.mk

@@ -1,4 +1,4 @@
-$(call inherit-product, vendor/aokp/products/common.mk)
+$(call inherit-product, vendor/aokp/configs/common.mk)
 
 PRODUCT_COPY_FILES += \
     vendor/aokp/prebuilt/common/app/NovaLauncher.apk:system/app/NovaLauncher.apk

products/common_tablet.mk → configs/common_tablet.mk

@@ -1,7 +1,7 @@
 # Inherit common tuff
-$(call inherit-product, vendor/aokp/products/common.mk)
+$(call inherit-product, vendor/aokp/configs/common.mk)
 
-PRODUCT_PACKAGE_OVERLAYS += vendor/aokp/overlay/common_tablets
+PRODUCT_PACKAGE_OVERLAYS += vendor/aokp/configs/common_tablets
 
 # Default ringtone
 PRODUCT_PROPERTY_OVERRIDES += \

overlay/p4-common/frameworks/base/core/res/res/values/config.xml

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2011, 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. -->
+<resources>
+
+    <!-- This device does not allow sms service. -->
+    <bool name="config_sms_capable">false</bool>
+
+    <bool name="config_enableCrtAnimations">false</bool>
+
+    <string name="config_datause_iface">eth0</string>
+
+    <!-- XXXXX NOTE THE FOLLOWING RESOURCES USE THE WRONG NAMING CONVENTION.
+         Please don't copy them, copy anything else. -->
+
+    <!-- This string array should be overridden by the device to present a list of network
+         attributes.  This is used by the connectivity manager to decide which networks can coexist
+         based on the hardware -->
+    <!-- An Array of "[Connection name],[ConnectivityManager connection type],
+         [associated radio-type],[priority],[restoral-timer(ms)],[dependencyMet]  -->
+    <!-- the 5th element "resore-time" indicates the number of milliseconds to delay
+         before automatically restore the default connection.  Set -1 if the connection
+         does not require auto-restore. -->
+    <!-- the 6th element indicates boot-time dependency-met value. -->
+    <string-array translatable="false" name="networkAttributes">
+        <item>"wifi,1,1,1,-1,true"</item>	
+        <item>"bluetooth,7,7,0,-1,true"</item>
+        <item>"wifi_p2p,13,1,0,-1,false"</item>
+    </string-array>
+
+    <!-- This string array should be overridden by the device to present a list of radio
+         attributes.  This is used by the connectivity manager to decide which networks can coexist
+         based on the hardware -->
+    <!-- An Array of "[ConnectivityManager connectionType],
+                      [# simultaneous connection types]"  -->
+    <string-array translatable="false" name="radioAttributes">
+        <item>"1,1"</item>
+        <item>"7,1"</item>
+    </string-array>
+
+</resources>

overlay/p4-common/packages/apps/ROMControl/res/values/config.xml

@@ -0,0 +1,3 @@
+<resources>
+	<bool name="has_notification_led">false</bool>
+</resources>

overlay/stingray/packages/apps/ROMControl/res/values/config.xml

@@ -0,0 +1,3 @@
+<resources>
+	<bool name="has_notification_led">false</bool>
+</resources>

overlay/supersonic/packages/apps/ROMControl/res/values/arrays.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+	<string-array name="available_toggles_entries">
+		<item>ROTATE</item>
+		<item>BT</item>
+		<item>GPS</item>
+		<item>WIFI</item>
+		<item>AIRPLANE_MODE</item>
+		<item>VIBRATE</item>
+		<item>SILENT</item>
+		<item>SYNC</item>
+		<item>DATA</item>
+		<item>AP</item>
+		<item>TORCH</item>
+	</string-array>
+
+	<string-array name="available_toggles_values">
+		<item>Auto-rotate</item>
+		<item>BT</item>
+		<item>GPS</item>
+		<item>Wi-Fi</item>
+		<item>Airplane mode</item>
+		<item>Vibrate</item>
+		<item>Silent</item>
+		<item>Sync</item>
+		<item>Data</item>
+		<item>Tethering (AP)</item>
+		<item>Torch</item>
+	</string-array>
+
+</resources>

overlay/vzwtab/packages/apps/ROMControl/res/values/config.xml

@@ -0,0 +1,4 @@
+<resources>
+  <bool name="has_notification_led">false</bool>
+</resources>
+

overlay/wingray/packages/apps/ROMControl/res/values/config.xml

@@ -0,0 +1,3 @@
+<resources>
+	<bool name="has_notification_led">false</bool>
+</resources>

products/AndroidProducts.mk

@@ -1,5 +1,16 @@
 PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/crespo.mk \
     $(LOCAL_DIR)/crespo4g.mk \
+    $(LOCAL_DIR)/inc.mk \
     $(LOCAL_DIR)/maguro.mk \
-    $(LOCAL_DIR)/toro.mk 
+    $(LOCAL_DIR)/otter.mk \
+    $(LOCAL_DIR)/p4.mk \
+    $(LOCAL_DIR)/p4vzw.mk \
+    $(LOCAL_DIR)/p4wifi.mk \
+    $(LOCAL_DIR)/stingray.mk \
+    $(LOCAL_DIR)/supersonic.mk \
+    $(LOCAL_DIR)/tenderloin.mk \
+    $(LOCAL_DIR)/toro.mk \
+    $(LOCAL_DIR)/vivow.mk \
+    $(LOCAL_DIR)/vzwtab.mk \
+    $(LOCAL_DIR)/wingray.mk

products/crespo.mk

@@ -2,7 +2,7 @@
 $(call inherit-product, device/samsung/crespo/full_crespo.mk)
 
 # Inherit common product files.
-$(call inherit-product, vendor/aokp/products/common_phone.mk)
+$(call inherit-product, vendor/aokp/configs/common_phone.mk)
 
 # Common overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/aokp/overlay/crespo
@@ -16,17 +16,8 @@ PRODUCT_MANUFACTURER := samsung
 
 PRODUCT_BUILD_PROP_OVERRIDES := PRODUCT_NAME=soju BUILD_ID=IML74K BUILD_FINGERPRINT=google/soju/crespo:4.0.3/IML74K/239410:user/release-keys PRIVATE_BUILD_DESC="soju-user 4.0.3 IML74K 239410 release-keys" BUILD_NUMBER=239410
 
-# Inherit common build.prop overrides
--include vendor/aokp/products/common_versions.mk
-
 # Copy crespo specific prebuilt files
 PRODUCT_COPY_FILES +=  \
-    vendor/aokp/prebuilt/crespo/app/Thinkfree.apk:system/app/Thinkfree.apk \
+    vendor/aokp/prebuilt/crespo/Thinkfree.apk:system/app/Thinkfree.apk \
     vendor/aokp/prebuilt/hdpi/bootanimation.zip:system/media/bootanimation.zip
 
-# Inherit Face lock security blobs
-#-include vendor/aokp/products/common_facelock.mk
-
-# Inherit drm blobs
-#-include vendor/aokp/products/common_drm.mk
-

products/crespo4g.mk

@@ -2,7 +2,7 @@
 $(call inherit-product, device/samsung/crespo4g/full_crespo4g.mk)
 
 # Inherit common product files.
-$(call inherit-product, vendor/aokp/products/common_phone.mk)
+$(call inherit-product, vendor/aokp/configs/common_phone.mk)
 
 # Common overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/aokp/overlay/crespo4g
@@ -16,18 +16,8 @@ PRODUCT_MANUFACTURER := samsung
 
 PRODUCT_BUILD_PROP_OVERRIDES := PRODUCT_NAME=sojus BUILD_ID=GWK74 BUILD_FINGERPRINT=google/sojus/crespo4g:2.3.7/GWK74/185293:user/release-keys PRIVATE_BUILD_DESC="sojus-user 2.3.7 GWK74 185293 release-keys" BUILD_NUMBER=185293
 
-# Inherit common build.prop overrides
--include vendor/aokp/products/common_versions.mk
-
 # Copy crespo4g specific prebuilt files
 PRODUCT_COPY_FILES +=  \
     vendor/aokp/prebuilt/crespo/app/Thinkfree.apk:system/app/Thinkfree.apk \
     vendor/aokp/prebuilt/hdpi/bootanimation.zip:system/media/bootanimation.zip
 
-
-# Inherit Face lock security blobs
-#-include vendor/aokp/products/common_facelock.mk
-
-# Inherit drm blobs
-#-include vendor/aokp/products/common_drm.mk
-

products/inc.mk

@@ -0,0 +1,19 @@
+# Inherit AOSP device configuration for inc.
+$(call inherit-product, device/htc/inc/full_inc.mk)
+
+# Inherit some common aokp stuff.
+$(call inherit-product, vendor/aokp/configs/common_phone.mk)
+
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := aokp_inc
+PRODUCT_BRAND := verizon_wwe
+PRODUCT_DEVICE := inc
+PRODUCT_MODEL := Incredible
+PRODUCT_MANUFACTURER := HTC
+PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=GRJ22 BUILD_FINGERPRINT=verizon_wwe/inc/inc/inc:2.3.4/GRJ22/185897.2:user/release-keys PRIVATE_BUILD_DESC="4.08.605.2 CL185897 release-keys"
+
+PRODUCT_PACKAGES += \
+    Camera

products/maguro.mk

@@ -2,7 +2,7 @@
 $(call inherit-product, device/samsung/maguro/full_maguro.mk)
 
 # Inherit common product files.
-$(call inherit-product, vendor/aokp/products/common_phone.mk)
+$(call inherit-product, vendor/aokp/configs/common_phone.mk)
 
 # Tuna overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/aokp/overlay/tuna
@@ -17,9 +17,6 @@ PRODUCT_MANUFACTURER := samsung
 
 PRODUCT_BUILD_PROP_OVERRIDES := PRODUCT_NAME=yakju BUILD_ID=ITL41F BUILD_FINGERPRINT=google/yakju/maguro:4.0.1/ITL41F/228551:user/release-keys PRIVATE_BUILD_DESC="yakju-user 4.0.1 ITL41F 228551 release-keys" BUILD_NUMBER=228551
 
-# Inherit common build.prop overrides
--include vendor/aokp/products/common_versions.mk
-
 # Copy maguro specific prebuilt files
 PRODUCT_COPY_FILES +=  \
     vendor/aokp/prebuilt/tuna/Thinkfree.apk:system/app/Thinkfree.apk \

products/otter.mk

@@ -0,0 +1,10 @@
+$(call inherit-product, device/amazon/otter/device.mk)
+$(call inherit-product, vendor/aokp/configs/common_tablet.mk)
+
+# Set those variables here to overwrite the inherited values.
+PRODUCT_NAME := aokp_otter
+PRODUCT_DEVICE := otter
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := Amazon Kindle Fire
+PRODUCT_MANUFACTURER := Amazon
+PRODUCT_RELEASE_NAME := KFire

products/p4.mk

@@ -0,0 +1,18 @@
+$(call inherit-product, device/samsung/p4/p4.mk)
+
+# Inherit common product files.
+$(call inherit-product, vendor/aokp/configs/common_tablet.mk)
+
+PRODUCT_PACKAGE_OVERLAYS += vendor/aokp/overlay/p4-common
+
+PRODUCT_NAME := aokp_p4
+PRODUCT_BRAND := samsung
+PRODUCT_DEVICE := p4
+PRODUCT_MODEL := GT-P7500
+PRODUCT_MANUFACTURER := samsung
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=GT-P7500 BUILD_ID=HTJ85B BUILD_FINGERPRINT=samsung/GT-P7500/GT-P7500:3.2/HTJ85B/XWKK4:user/release-keys PRIVATE_BUILD_DESC="GT-P7500-user 3.2 HTJ85B XWKK4 release-keys"
+
+PRODUCT_RELEASE_NAME := p4
+
+PRODUCT_COPY_FILES +=  \
+    vendor/aokp/prebuilt/common/media/bootanimation.zip:system/media/bootanimation.zip

products/p4vzw.mk

@@ -0,0 +1,16 @@
+$(call inherit-product, device/samsung/p4vzw/p4vzw.mk)
+
+# Inherit common product files.
+$(call inherit-product, vendor/aokp/configs/common_tablet.mk)
+
+PRODUCT_PACKAGE_OVERLAYS += vendor/aokp/overlay/p4-common
+
+PRODUCT_NAME := aokp_p4vzw
+PRODUCT_BRAND := samsung
+PRODUCT_DEVICE := p4vzw
+PRODUCT_MODEL := SCH-I905
+PRODUCT_MANUFACTURER := samsung
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=SCH-I905 BUILD_ID=HMJ37 BUILD_FINGERPRINT=samsung/SCH-I905/SCH-I905:3.1/HMJ37/EH04:user/release-keys PRIVATE_BUILD_DESC="SCH-I905-user 3.1 HMJ37 EH04 release-keys"
+
+PRODUCT_COPY_FILES +=  \
+    vendor/aokp/prebuilt/common/media/bootanimation.zip:system/media/bootanimation.zip

products/p4wifi.mk

@@ -0,0 +1,16 @@
+$(call inherit-product, device/samsung/p4wifi/p4wifi.mk)
+
+# Inherit common product files.
+$(call inherit-product, vendor/aokp/configs/common_tablet.mk)
+
+PRODUCT_PACKAGE_OVERLAYS += vendor/aokp/overlay/p4-common
+
+PRODUCT_NAME := aokp_p4wifi
+PRODUCT_BRAND := samsung
+PRODUCT_DEVICE := p4wifi
+PRODUCT_MODEL := GT-P7510
+PRODUCT_MANUFACTURER := samsung
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=GT-P7510 BUILD_ID=HTJ85B BUILD_FINGERPRINT=samsung/GT-P7510/GT-P7510:3.2/HTJ85B/UEKMM:user/release-keys PRIVATE_BUILD_DESC="GT-P7510-user 3.2 HTJ85B UEKMM release-keys"
+
+PRODUCT_COPY_FILES +=  \
+    vendor/aokp/prebuilt/common/media/bootanimation.zip:system/media/bootanimation.zip

products/stingray.mk

@@ -0,0 +1,17 @@
+$(call inherit-product, device/moto/stingray/full_stingray.mk)
+
+$(call inherit-product, vendor/aokp/configs/common_tablet.mk)
+
+PRODUCT_PACKAGE_OVERLAYS += vendor/aokp/overlay/stingray
+
+# Discard inherited values and use our own instead.
+PRODUCT_NAME := aokp_stingray
+PRODUCT_BRAND := verizon
+PRODUCT_DEVICE := stingray
+PRODUCT_MODEL := Xoom
+PRODUCT_MANUFACTURER := Motorola
+
+PRODUCT_BUILD_PROP_OVERRIDES := PRODUCT_NAME=trygon BUILD_ID=HLK75F BUILD_FINGERPRINT=verizon/trygon/stingray:3.2.4/HLK75F/221360:user/release-keys PRIVATE_BUILD_DESC="trygon-user 3.2.4 HLK75F 221360 release-keys" BUILD_NUMBER=221360
+
+PRODUCT_COPY_FILES +=  \
+    vendor/aokp/prebuilt/common/media/bootanimation.zip:system/media/bootanimation.zip

products/supersonic.mk

@@ -0,0 +1,20 @@
+# Inherit AOSP device configuration for supersonic.
+$(call inherit-product, device/htc/supersonic/full_supersonic.mk)
+
+# Inherit some common aokp stuff.
+$(call inherit-product, vendor/aokp/configs/common_phone.mk)
+
+PRODUCT_PACKAGE_OVERLAYS += vendor/aokp/overlay/supersonic
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := aokp_supersonic
+PRODUCT_BRAND := sprint
+PRODUCT_DEVICE := supersonic
+PRODUCT_MODEL := PC36100
+PRODUCT_MANUFACTURER := HTC
+PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=GRI40 PRODUCT_NAME=htc_supersonic BUILD_FINGERPRINT=sprint/htc_supersonic/supersonic:2.3.3/GRI40/61076:user/release-keys PRIVATE_BUILD_DESC="4.24.651.1 CL61076 release-keys"
+
+PRODUCT_PACKAGES += \
+    Camera

products/tenderloin.mk

@@ -0,0 +1,10 @@
+$(call inherit-product, device/hp/tenderloin/device_tenderloin.mk)
+
+PRODUCT_RELEASE_NAME := Touchpad
+
+$(call inherit-product, vendor/aokp/configs/common_tablet.mk)
+
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=touchpad BUILD_ID=GWK74 BUILD_FINGERPRINT=google/yakju/maguro:4.0.1/ITL41D/223971:user/release-keys PRIVATE_BUILD_DESC="yakju-user 4.0.1 ITL41D 223971 release-keys" BUILD_NUMBER=189904
+
+PRODUCT_NAME := aokp_tenderloin
+PRODUCT_DEVICE := tenderloin