Update with i9100 things

CyanogenMod · Jul 25, 2012 · 54ae53c · 54ae53c
1 parent 66222d3
commit 54ae53c
Show file tree

Hide file tree

Showing 10 changed files with 185 additions and 13 deletions.
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
@@ -15,4 +15,4 @@
 #
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/full_n700Â0.mk
+    $(LOCAL_DIR)/full_i9100.mk
diff --git a/BoardConfig.mk b/BoardConfig.mk
@@ -28,7 +28,7 @@ TARGET_KERNEL_CONFIG := cyanogenmod_n7000_defconfig
 TARGET_SPECIFIC_HEADER_PATH += device/samsung/n7000/overlay/include
 EXYNOS4210_ENHANCEMENTS := true
 # assert
-TARGET_OTA_ASSERT_DEVICE := galaxynote,n7000,GT-N7000
+TARGET_OTA_ASSERT_DEVICE := galaxynote,n7000,N7000,GT-N7000
 
 # Use the non-open-source parts, if they're present
 -include vendor/samsung/n7000/BoardConfigVendor.mk
diff --git a/cm.dependencies b/cm.dependencies
@@ -7,8 +7,13 @@
         "repository": "android_kernel_samsung_smdk4210",
         "target_path": "kernel/samsung/smdk4210"
     },
+    {
+        "repository": "android_hardware_samsung",
+        "target_path": "hardware/samsung"
+    },
     {
         "repository": "android_packages_apps_SamsungServiceMode",
-        "target_path": "packages/apps/SamsungServiceMode"
+        "target_path": "packages/apps/SamsungServiceMode",
+        "branch": "ics"
     }
 ]
diff --git a/cm.mk b/cm.mk
@@ -33,4 +33,4 @@ PRODUCT_BRAND := Samsung
 PRODUCT_MODEL := GT-N7000
 
 # Set build fingerprint / ID / Prduct Name ect.
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=GT-N7000 TARGET_DEVICE=GT-N7000 BUILD_FINGERPRINT=samsung/GT-I9100/GT-I9100:4.0.3/IML74K/XXLPQ:user/release-keys PRIVATE_BUILD_DESC="GT-I9100-user 4.0.3 IML74K XXLPQ release-keys"
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=GT-I9100 TARGET_DEVICE=GT-I9100 BUILD_FINGERPRINT=samsung/GT-I9100/GT-I9100:4.0.3/IML74K/XXLPQ:user/release-keys PRIVATE_BUILD_DESC="GT-I9100-user 4.0.3 IML74K XXLPQ release-keys"
diff --git a/full_n7000.mk b/full_n7000.mk
@@ -22,7 +22,6 @@
 #
 
 # Inherit from those products. Most specific first.
-$(call inherit-product, frameworks/native/build/phone-xhdpi-1024-dalvik-heap.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 $(call inherit-product, device/samsung/n7000/n7000.mk)
 
@@ -32,9 +31,3 @@ PRODUCT_DEVICE := n7000
 PRODUCT_BRAND := samsung
 PRODUCT_MANUFACTURER := samsung
 PRODUCT_MODEL := GT-N7000
-
-# This device is xhdpi.
-PRODUCT_AAPT_CONFIG := normal xhdpi
-PRODUCT_AAPT_PREF_CONFIG := xhdpi
-PRODUCT_LOCALES += xhdpi
-
diff --git a/n7000.mk b/n7000.mk
@@ -22,6 +22,14 @@ LOCAL_PATH := device/samsung/n7000
 # Overlay
 DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
 
+# This device is xhdpi.
+PRODUCT_AAPT_CONFIG := normal xhdpi
+PRODUCT_AAPT_PREF_CONFIG := xhdpi
+PRODUCT_LOCALES += xhdpi
+
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.sf.lcd_density=320
+
 # Keylayout
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/usr/keylayout/AVRCP.kl:system/usr/keylayout/AVRCP.kl \

diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -0,0 +1,145 @@
+<?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>
+
+    <!-- Flag indicating whether we should enable the automatic brightness in Settings.
+         config_hardware_automatic_brightness_available is not set, so we will use software implementation -->
+    <bool name="config_automatic_brightness_available">true</bool>
+
+    <!-- Array of light sensor LUX values to define our levels for auto backlight brightness support.
+         The N entries of this array define N + 1 zones as follows:
+
+         Zone 0:        0 <= LUX < array[0]
+         Zone 1:        array[0] <= LUX < array[1]
+         ...
+         Zone N:        array[N - 1] <= LUX < array[N]
+         Zone N + 1:    array[N] <= LUX < infinity
+
+         Must be overridden in platform specific overlays -->
+    <integer-array name="config_autoBrightnessLevels">
+        <item>6</item>
+        <item>9</item>
+        <item>14</item>
+        <item>20</item>
+        <item>30</item>
+        <item>46</item>
+        <item>68</item>
+        <item>103</item>
+        <item>154</item>
+        <item>231</item>
+        <item>346</item>
+        <item>519</item>
+        <item>778</item>
+        <item>1168</item>
+        <item>1752</item>
+        <item>2627</item>
+        <item>3941</item>
+        <item>5912</item>
+        <item>8867</item>
+    </integer-array>
+
+    <!-- Array of output values for LCD backlight corresponding to the LUX values
+         in the config_autoBrightnessLevels array.  This array should have size one greater
+         than the size of the config_autoBrightnessLevels array.
+    -->
+    <integer-array name="config_autoBrightnessLcdBacklightValues">
+        <item>19</item>
+        <item>23</item>
+        <item>26</item>
+        <item>30</item>
+        <item>34</item>
+        <item>39</item>
+        <item>45</item>
+        <item>51</item>
+        <item>59</item>
+        <item>67</item>
+        <item>77</item>
+        <item>88</item>
+        <item>101</item>
+        <item>116</item>
+        <item>133</item>
+        <item>152</item>
+        <item>174</item>
+        <item>199</item>
+        <item>228</item>
+        <item>250</item>
+    </integer-array>
+
+    <!-- Array of output values for button backlight corresponding to the LUX values
+         in the config_autoBrightnessLevels array.  This array should have size one greater
+         than the size of the config_autoBrightnessLevels array.
+    -->
+    <integer-array name="config_autoBrightnessButtonBacklightValues">
+        <item>0</item>
+        <item>0</item>
+        <item>0</item>
+        <item>0</item>
+        <item>0</item>
+        <item>0</item>
+        <item>0</item>
+        <item>0</item>
+        <item>0</item>
+        <item>0</item>
+        <item>0</item>
+        <item>0</item>
+        <item>0</item>
+        <item>0</item>
+        <item>0</item>
+        <item>0</item>
+        <item>0</item>
+        <item>0</item>
+        <item>0</item>
+        <item>0</item>
+    </integer-array>
+
+    <!-- Array of output values for keyboard backlight corresponding to the LUX values
+         in the config_autoBrightnessLevels array.  This array should have size one greater
+         than the size of the config_autoBrightnessLevels array.
+         Crespo has no keyboard so all values are zero.
+    -->
+    <integer-array name="config_autoBrightnessKeyboardBacklightValues">
+        <item>0</item>
+        <item>0</item>
+        <item>0</item>
+        <item>0</item>
+        <item>0</item>
+        <item>0</item>
+        <item>0</item>
+        <item>0</item>
+        <item>0</item>
+        <item>0</item>
+        <item>0</item>
+        <item>0</item>
+        <item>0</item>
+        <item>0</item>
+        <item>0</item>
+        <item>0</item>
+        <item>0</item>
+        <item>0</item>
+        <item>0</item>
+        <item>0</item>
+    </integer-array>
+
+    <!-- Minimum screen brightness allowed by the power manager. -->
+    <integer name="config_screenBrightnessDim">29</integer>
+
+</resources>
diff --git a/proprietary-files.sh b/proprietary-files.sh
@@ -16,7 +16,7 @@
 
 VENDOR=samsung
 COMMON=galaxys2-common
-DEVICE=i9100
+DEVICE=n7000
 COMMONOUTDIR=vendor/$VENDOR/$COMMON
 COMMONBASE=../../../$COMMONOUTDIR/proprietary
 COMMONMAKEFILE=../../../$COMMONOUTDIR/common-vendor-blobs.mk

diff --git a/proprietary-n7000-files.txt b/proprietary-n7000-files.txt
@@ -0,0 +1,21 @@
+system/bin/rild 
+system/lib/libril.so 
+system/lib/libsec-ril.so 
+system/lib/libsecril-client.so 
+system/bin/bcm4330B1.hcd 
+system/etc/wifi/bcm4330_apsta.bin 
+system/etc/wifi/bcm4330_mfg.bin 
+system/etc/wifi/bcm4330_p2p.bin 
+system/etc/wifi/bcm4330_sta.bin 
+system/etc/wifi/nvram_mfg.txt 
+system/etc/wifi/nvram_mfg.txt_murata 
+system/etc/wifi/nvram_net.txt 
+system/etc/wifi/nvram_net.txt_AU 
+system/etc/wifi/nvram_net.txt_IL 
+system/etc/wifi/nvram_net.txt_SG 
+system/etc/wifi/nvram_net.txt_TN 
+system/etc/wifi/nvram_net.txt_murata 
+system/etc/wifi/nvram_net.txt_murata_AU 
+system/etc/wifi/nvram_net.txt_murata_IL 
+system/etc/wifi/nvram_net.txt_murata_SG 
+system/etc/wifi/nvram_net.txt_murata_TN 
diff --git a/system.prop b/system.prop
@@ -1,5 +1,5 @@
 #
-# system.prop for n7000
+# system.prop for i9100
 #
 
 rild.libpath=/system/lib/libsec-ril.so