From f5b0bae7ce1a1c21621001d9dde0650914d5135c Mon Sep 17 00:00:00 2001
From: Arif Ali <mail@arif-ali.co.uk>
Date: Fri, 21 Oct 2011 01:38:55 +0100
Subject: [PATCH] leo: amend this new branch to compile against aosp code

---
 BoardConfig.mk                                         | 2 +-
 leo.mk                                                 | 2 +-
 overlay/frameworks/base/core/res/res/values/config.xml | 2 ++
 vendorsetup.sh                                         | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index b29ad06..73c7a57 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -97,7 +97,7 @@ TARGET_RELEASETOOLS_EXTENSIONS := device/htc/common
 TARGET_PREBUILT_KERNEL := device/htc/leo/prebuilt/kernel
 
 # to enable the GPS HAL
-BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE := leo
+BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE := htcleo
 # AMSS version to use for GPS
 BOARD_VENDOR_QCOM_GPS_LOC_API_AMSS_VERSION := 3200
 
diff --git a/leo.mk b/leo.mk
index 255b676..c43604c 100755
--- a/leo.mk
+++ b/leo.mk
@@ -86,7 +86,7 @@ PRODUCT_COPY_FILES += \
 
 #GSM APN LIST
 PRODUCT_COPY_FILES += \
-    vendor/cyanogen/prebuilt/common/etc/apns-conf.xml:system/etc/apns-conf.xml
+    development/data/etc/apns-conf.xml:system/etc/apns-conf.xml
 
 
 PRODUCT_COPY_FILES += \
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 7f224d7..602015e 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -181,11 +181,13 @@
     <bool name="config_animateScreenLights">false</bool>
 
    <!-- Enable Tablet tweaks -->
+   <!--
     <bool name="cm_default_has_soft_buttons">true</bool>
     <bool name="cm_default_show_soft_home">false</bool>
     <bool name="cm_default_show_soft_menu">false</bool>
     <bool name="cm_default_show_soft_back">false</bool>
     <bool name="cm_default_show_soft_search">false</bool>
     <bool name="cm_default_show_soft_quick_na">false</bool>
+   -->
 
 </resources>
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 6b7348b..61fd8f4 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -22,3 +22,4 @@
 
 add_lunch_combo htc_leo-userdebug
 add_lunch_combo htc_leo-eng
+add_lunch_combo full_leo-eng