Merge branch jellybean of ViperDevs/android_device_lge_ls840 into Pro…

…jectOpenCannibal/android_device_lge_ls840.

Code submitted by Ryan Norris @ 12:44 PM.

Code reviewed by JenkinsBot @ 12:45 PM.
JenkinsBot gave a -1. Comment: I would prefer that you do not submit this as it error 1.

Patch Set #2 submitted by JenkinsBot @ 12:46 PM.
Patch Set #2 accepted by JenkinsBot @ 12:46 PM.

Patch Set #2 accepted by Ryan Norris @ 12:47 PM.

Merging into upstream @ 12:48 PM.

Major Rewrite of LG Viper Device Tree, now CM buildable, and most shit works now.

Android.mk

@@ -0,0 +1,24 @@
+# Copyright (C) 2010 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.
+
+LOCAL_PATH := $(call my-dir)
+
+ifeq ($(TARGET_DEVICE),ls840)
+
+ifneq ($(TARGET_SIMULATOR),true)
+include $(call all-makefiles-under,$(LOCAL_PATH))
+endif
+
+endif
+

AndroidBoard.mk

@@ -0,0 +1,8 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+ALL_PREBUILT += $(INSTALLED_KERNEL_TARGET)
+
+# include the non-open-source counterpart to this file
+-include vendor/lge/ls840/AndroidBoardVendor.mk

AndroidProducts.mk

@@ -0,0 +1,29 @@
+#
+# Copyright (C) 2013 Ryan Norris
+#
+# 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.
+#
+
+#
+# This file should set PRODUCT_MAKEFILES to a list of product makefiles
+# to expose to the build system.  LOCAL_DIR will already be set to
+# the directory containing this file.
+#
+# This file may not rely on the value of any variable other than
+# LOCAL_DIR; do not use any conditionals, and do not look up the
+# value of any variable that isn't set in this file or in a file that
+# it includes.
+#
+
+PRODUCT_MAKEFILES := \
+    $(LOCAL_DIR)/full_ls840.mk

BoardConfig.mk

@@ -0,0 +1,140 @@
+#
+# Copyright (C) 2013 The Panda Project / Ryan Norris
+#
+# 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.
+#
+
+
+# This variable is set first, so it can be overridden
+# by BoardConfigVendor.mk
+USE_CAMERA_STUB := true
+BOARD_USES_GENERIC_AUDIO := true
+#BOARD_USES_LIBSECRIL_STUB := true
+#BOARD_USE_SKIA_LCDTEXT := true
+
+# Architecture
+TARGET_ARCH_VARIANT := armv7-a-neon
+TARGET_CPU_ABI := armeabi-v7a
+TARGET_ABI2 := armeabi
+TARGET_CPU_SMP := true
+ARCH_ARM_HAVE_TLS_REGISTER := true
+TARGET_GLOBAL_CFLAGS += -mfpu=neon -mfloat-abi=softfp
+TARGET_GLOBAL_CPPFLAGS += -mfpu=neon -mfloat-abi=softfp
+COMMON_GLOBAL_CFLAGS += -DREFRESH_RATE=60 -DQCOM_HARDWARE -DNO_QCOM_MVS
+
+# Assert for OTA
+TARGET_OTA_ASSERT_DEVICE := viper4glte,lgls840,ls840
+
+# Bluetooth
+BOARD_HAVE_BLUETOOTH := true
+BOARD_HAVE_BLUETOOTH_BCM := true
+
+# Bootloader
+TARGET_NO_BOOTLOADER := true
+
+# Camera
+BOARD_USES_PROPRIETARY_LIBCAMERA := true
+
+# Charging mode
+#BOARD_CHARGING_MODE_BOOTING_LPM := /sys/class/power_supply/battery/batt_lp_charging
+#BOARD_BATTERY_DEVICE_NAME := "battery"
+#BOARD_CHARGER_RES := device/lge/ls840/res/charger
+
+# HWComposer
+#BOARD_USES_HWCOMPOSER := true
+#BOARD_USES_FIMGAPI := true
+#BOARD_HDMI_DDC_CH := DDC_CH_I2C_7
+#BOARD_USES_PROPRIETARY_LIBFIMC := true
+
+# Kernel Config
+TARGET_PREBUILT_KERNEL := device/lge/ls840/kernel
+TARGET_KERNEL_SOURCE := kernel/lge/ls840
+TARGET_KERNEL_CONFIG := cyanogenmod_ls840_defconfig
+
+# Notification LED
+BOARD_HAS_LED_NOTIF := true
+
+# Partition Information
+BOARD_BOOTIMAGE_PARTITION_SIZE      := 10485760
+BOARD_RECOVERYIMAGE_PARTITION_SIZE := 16777216
+BOARD_SYSTEMIMAGE_PARTITION_SIZE   := 1073741824
+BOARD_USERDATAIMAGE_PARTITION_SIZE := 1887436800
+BOARD_FLASH_BLOCK_SIZE 		   := 131072
+BOARD_DATA_DEVICE := /dev/block/mmcblk0p29
+BOARD_DATA_FILESYSTEM := ext4
+BOARD_DATA_FILESYSTEM_OPTIONS := nosuid,nodev,relatime,barrier=1,noauto_da_alloc
+BOARD_SYSTEM_DEVICE := /dev/block/mmcblk0p27 BOARD_SYSTEM_FILESYSTEM_OPTIONS := noatime,nodiratime,barrier=1,noauto_da_alloc
+BOARD_SYSTEM_FILESYSTEM := ext4
+BOARD_CACHE_DEVICE := /dev/block/mmcblk0p28
+BOARD_CACHE_FILESYSTEM := ext4
+BOARD_CACHE_FILESYSTEM_OPTIONS := nosuid,nodev,relatime,barrier=1,noauto_da_alloc
+BOARD_SDCARD_DEVICE_PRIMARY := /dev/block/mmcblk1p1
+BOARD_SDCARD_DEVICE_SECONDARY := /dev/block/mmcblk1
+BOARD_KERNEL_CMDLINE := vmalloc=400M, console=ttyDCC0,115200,n8 androidboot.hardware=qcom loglevel=1
+BOARD_KERNEL_BASE := 0x40200000
+BOARD_KERNEL_PAGESIZE := 2048
+BOARD_USES_MMCUTILS := true
+BOARD_VOLD_EMMC_SHARES_DEV_MAJOR := true
+#BOARD_HAS_LARGE_FILESYSTEM := true
+
+# Platform
+TARGET_BOARD_PLATFORM := msm8660
+TARGET_BOARD_PLATFORM_GPU := qcom-adreno200
+TARGET_BOOTLOADER_BOARD_NAME := msm8660
+TARGET_BOARD_INFO_FILE := device/lge/ls840/board-info.txt
+TARGET_USERIMAGES_USE_EXT4 := true
+
+# Recovery
+TARGET_PREBUILT_RECOVERY_KERNEL := device/lge/ls840/recovery/recovery_kernel
+#BOARD_CUSTOM_RECOVERY_KEYMAPPING := device/lge/ls840/recovery/recovery_keys.c
+BOARD_CUSTOM_RECOVERY_UI := ../../../device/lge/ls840/recovery/recovery_ui_ls840.c
+BOARD_HAS_NO_MISC_PARTITION := false
+BOARD_CUSTOM_GRAPHICS := ../../../device/lge/ls840/recovery/graphics.c
+BOARD_HAS_NO_SELECT_BUTTON := true
+DEVICE_RESOLUTION        := 480x800
+TARGET_RECOVERY_PIXEL_FORMAT := "RGBX_8888"
+TW_FLASH_FROM_STORAGE 	     := true
+TW_NO_REBOOT_BOOTLOADER      := true
+
+# RIL
+BOARD_MOBILEDATA_INTERFACE_NAME := "ppp0"
+
+# Scorpion optimizations
+TARGET_USE_SCORPION_BIONIC_OPTIMIZATION := true
+TARGET_USE_SCORPION_PLD_SET := true
+TARGET_SCORPION_BIONIC_PLDOFFS := 6
+TARGET_SCORPION_BIONIC_PLDSIZE := 128
+
+# WebKit
+ENABLE_WEBGL := true
+
+# Wifi
+BOARD_WLAN_DEVICE                := bcmdhd
+BOARD_WLAN_DEVICE_REV            := bcm4330_b1
+WPA_SUPPLICANT_VERSION           := VER_0_8_X
+BOARD_WPA_SUPPLICANT_DRIVER      := NL80211
+BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_bcmdhd
+BOARD_HOSTAPD_DRIVER             := NL80211
+BOARD_HOSTAPD_PRIVATE_LIB        := lib_driver_cmd_bcmdhd
+WIFI_DRIVER_MODULE_PATH          := "/system/lib/modules/dhd.ko"
+WIFI_DRIVER_FW_PATH_PARAM        := "/sys/module/dhd/parameters/firmware_path"
+WIFI_DRIVER_FW_PATH_STA          := "/system/etc/firmware/bcm4330_sta.bin"
+WIFI_DRIVER_FW_PATH_AP           := "/system/etc/firmware/fw_bcmdhd_apsta.bin"
+WIFI_DRIVER_FW_PATH_P2P          := "/system/etc/firmware/fw_bcmdhd_p2p.bin"
+WIFI_DRIVER_MODULE_NAME          := "dhd"
+WIFI_DRIVER_MODULE_ARG           := "firmware_path=/system/etc/wifi/bcm4330_sta.bin nvram_path=/system/etc/wifi/nvram_net.txt"
+WIFI_BAND                        := 802_11_ABG
+BOARD_LEGACY_NL80211_STA_EVENTS  := true
+
+# Use the non-open-source parts, if they're present
+-include vendor/lge/ls840/BoardConfigVendor.mk

CleanSpec.mk

@@ -0,0 +1,52 @@
+# Copyright (C) 2007 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.
+#
+
+# If you don't need to do a full clean build but would like to touch
+# a file or delete some intermediate files, add a clean step to the end
+# of the list.  These steps will only be run once, if they haven't been
+# run before.
+#
+# E.g.:
+#     $(call add-clean-step, touch -c external/sqlite/sqlite3.h)
+#     $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)
+#
+# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with
+# files that are missing or have been moved.
+#
+# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.
+# Use $(OUT_DIR) to refer to the "out" directory.
+#
+# If you need to re-do something that's already mentioned, just copy
+# the command and add it to the bottom of the list.  E.g., if a change
+# that you made last week required touching a file and a change you
+# made today requires touching the same file, just copy the old
+# touch step and add it to the end of the list.
+#
+# ************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
+# ************************************************
+
+# For example:
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
+#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
+#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
+$(call add-clean-step, find $(PRODUCT_OUT) -name "*.apk" | xargs rm)
+
+# ************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
+# ************************************************
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/default.prop)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/Phone_intermediates)

DeviceSettings/Android.mk

@@ -0,0 +1,15 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_PACKAGE_NAME := GalaxyS2Settings
+LOCAL_CERTIFICATE := platform
+
+include $(BUILD_PACKAGE)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))

DeviceSettings/AndroidManifest.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.cyanogenmod.settings.device"
+    android:sharedUserId="android.uid.system" >
+
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
+
+    <application android:label="@string/app_name">
+        <activity
+            android:name="com.cyanogenmod.settings.device.DeviceSettings"
+            android:icon="@drawable/ic_launcher_cmdevicesettings"
+            android:label="@string/app_name" >
+            <intent-filter>
+                <action android:name="com.cyanogenmod.action.LAUNCH_DEVICE_SETTINGS" />
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+        </activity>
+
+        <receiver android:name=".Startup">
+            <intent-filter android:priority="100">
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+        </receiver>
+
+        <activity android:name=".mDNIeFragmentActivity" />
+        <activity android:name=".ScreenFragmentActivity" />
+
+    </application>
+</manifest>

DeviceSettings/res/layout/top.xml

@@ -0,0 +1,5 @@
+<android.support.v4.view.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/viewPager"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" />
+

DeviceSettings/res/values-de/arrays.xml

@@ -0,0 +1,69 @@
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <string-array name="mdnie_scenario_entries">
+        <item>Kamera (Standard)</item>
+        <item>Video</item>
+        <item>Video warm</item>
+        <item>Video kalt</item>
+        <item>UI</item>
+        <item>Navigation</item>
+        <item>Gallerie</item>
+        <item>VT</item>
+    </string-array>
+
+    <string-array name="mdnie_mode_entries">
+        <item>Standard</item>
+        <item>Dynamisch</item>
+        <item>Natürlich</item>
+        <item>Film</item>
+    </string-array>
+
+    <string-array name="mdnie_negative_entries">
+        <item>Normal</item>
+        <item>Invertiert</item>
+    </string-array>
+
+    <string-array name="mdnie_outdoor_entries">
+        <item>Deaktiviert</item>
+        <item>Aktiviert</item>
+    </string-array>
+
+    <string-array name="panel_gamma_entries">
+        <item>2.2 (Standard)</item>
+        <item>1.9</item>
+    </string-array>
+
+    <string-array name="touchscreen_sensitivity_entries">
+        <item>10</item>
+        <item>20</item>
+        <item>30</item>
+        <item>50 (Standard)</item>
+        <item>70</item>
+        <item>100</item>
+    </string-array>
+
+    <string-array name="vibrator_intensity_entries">
+        <item>0%</item>
+        <item>25%</item>
+        <item>50% (Standard)</item>
+        <item>75%</item>
+        <item>100%</item>
+    </string-array>
+
+    <string-array name="hspa_entries">
+        <item>Nur UMTS</item>
+        <item>Nur HSDPA</item>
+        <item>HSDPA + HSUPA</item>
+    </string-array>
+
+    <string-array name="touchkey_timeout_entries">
+            <item>Niemals</item>
+            <item>1 Sekunde</item>
+            <item>2 Sekunden</item>
+            <item>3 Sekunden (Standard)</item>
+            <item>4 Sekunden</item>
+            <item>5 Sekunden</item>
+            <item>6 Sekunden</item>
+    </string-array>
+
+</resources>