Merge pull request #25 from TeamHorizon/jb-mr1
Jb mr1
diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index 8261fab..a70f61f 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -9,13 +9,13 @@
$(LOCAL_DIR)/xenonhd_find5.mk \
$(LOCAL_DIR)/xenonhd_galaxysmtd.mk \
$(LOCAL_DIR)/xenonhd_grouper.mk \
+ $(LOCAL_DIR)/xenonhd_i605.mk \
$(LOCAL_DIR)/xenonhd_i9100.mk \
- $(LOCAL_DIR)/xenonhd_i9100g.mk \
- $(LOCAL_DIR)/xenonhd_i9300.mk \
- $(LOCAL_DIR)/xenonhd_i9305.mk \
- $(LOCAL_DIR)/xenonhd_jfltevzw.mk \
- $(LOCAL_DIR)/xenonhd_m7.mk \
- $(LOCAL_DIR)/xenonhd_maguro.mk \
+ $(LOCAL_DIR)/xenonhd_i9100g.mk \
+ $(LOCAL_DIR)/xenonhd_i9300.mk \
+ $(LOCAL_DIR)/xenonhd_i9305.mk \
+ $(LOCAL_DIR)/xenonhd_jfltevzw.mk \
+ $(LOCAL_DIR)/xenonhd_maguro.mk \
$(LOCAL_DIR)/xenonhd_mako.mk \
$(LOCAL_DIR)/xenonhd_mb886.mk \
$(LOCAL_DIR)/xenonhd_n7000.mk \
@@ -29,4 +29,4 @@
$(LOCAL_DIR)/xenonhd_vigor.mk \
$(LOCAL_DIR)/xenonhd_xt925.mk \
$(LOCAL_DIR)/xenonhd_xt926.mk \
- $(LOCAL_DIR)/xenonhd_xt907.mk
+ $(LOCAL_DIR)/xenonhd_xt907.mk
diff --git a/products/common.mk b/products/common.mk
index dde1d63..337498a 100644
--- a/products/common.mk
+++ b/products/common.mk
@@ -132,7 +132,7 @@
vendor/xenonhd/proprietary/common/etc/apns-conf.xml:system/etc/apns-conf.xml
endif
-ifneq ($(filter xenonhd_d2vzw xenonhd_jfltevzw xenonhd_d2usc xenonhd_xt926 ,$(TARGET_PRODUCT)),)
+ifneq ($(filter xenonhd_d2vzw xenonhd_jfltevzw xenonhd_d2usc xenonhd_xt926 xenonhd_i605 ,$(TARGET_PRODUCT)),)
PRODUCT_COPY_FILES += \
vendor/xenonhd/proprietary/common/etc/apns-conf-cdma.xml:system/etc/apns-conf.xml
endif
diff --git a/products/xenonhd_i605.mk b/products/xenonhd_i605.mk
new file mode 100755
index 0000000..e8413d4
--- /dev/null
+++ b/products/xenonhd_i605.mk
@@ -0,0 +1,39 @@
+# Specify phone tech before including full_phone
+$(call inherit-product, vendor/xenonhd/configs/vzw.mk)
+
+# Inherit device configuration
+$(call inherit-product, device/samsung/i605/full_i605.mk)
+
+# Inherit common product files.
+$(call inherit-product, vendor/xenonhd/products/common.mk)
+
+# Release name
+PRODUCT_RELEASE_NAME := i605
+
+# Boot animation
+TARGET_SCREEN_HEIGHT := 1280
+TARGET_SCREEN_WIDTH := 720
+
+# Inherit common build.prop overrides
+-include vendor/xenonhd/products/common_versions.mk
+
+# Copy maguro specific prebuilt files
+PRODUCT_COPY_FILES += \
+ vendor/xenonhd/proprietary/hybrid/hybrid_xhdpi_no_nav.conf:system/etc/beerbong/properties.conf \
+ vendor/xenonhd/proprietary/tuna/media/bootanimation.zip:system/media/bootanimation.zip \
+ vendor/xenonhd/proprietary/tuna/media/audio/notifications/Nexus.mp3:system/media/audio/notifications/Nexus.mp3 \
+ vendor/xenonhd/proprietary/common/media/LMprec_508.emd:system/media/LMprec_508.emd \
+ vendor/xenonhd/proprietary/common/media/PFFprec_600.emd:system/media/PFFprec_600.emd
+
+# Inherit drm blobs
+-include vendor/xenonhd/products/common_drm.mk
+
+# Device identifier. This must come after all inclusions
+PRODUCT_DEVICE := i605
+PRODUCT_NAME := xenonhd_i605
+PRODUCT_BRAND := samsung
+PRODUCT_MODEL := SCH-I605
+PRODUCT_MANUFACTURER := samsung
+
+# Set build fingerprint / ID / Product Name ect.
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=t0ltevzw TARGET_DEVICE=t0ltevzw BUILD_FINGERPRINT="Verizon/t0ltevzw/t0ltevzw:4.1.2/JZO54K/I605VRAMC3:user/release-keys" PRIVATE_BUILD_DESC="t0ltevzw-user 4.1.2 JZO54K I605VRAMC3 release-keys"
diff --git a/products/xenonhd_m7.mk b/products/xenonhd_m7.mk
deleted file mode 100644
index 2ec5c0d..0000000
--- a/products/xenonhd_m7.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-# Specify phone tech before including full_phone
-$(call inherit-product, vendor/xenonhd/configs/gsm.mk)
-
-# Release name
-PRODUCT_RELEASE_NAME := m7
-
-$(call inherit-product, vendor/xenonhd/products/common.mk)
-
-# Inherit device configuration
-$(call inherit-product, device/htc/m7/device_m7.mk)
-
-# Inherit common build.prop overrides
--include vendor/xenonhd/products/common_versions.mk
-
-# Inherit drm blobs
--include vendor/xenonhd/products/common_drm.mk
-
-# Device naming
-PRODUCT_DEVICE := m7
-PRODUCT_NAME := xenonhd_m7
-PRODUCT_BRAND := htc
-PRODUCT_MODEL := HTC One
-PRODUCT_MANUFACTURER := HTC
-
-
-# Set build fingerprint / ID / Product Name ect.
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_m7 BUILD_ID=JZO54K BUILD_FINGERPRINT="htc/m7/m7:4.1.2/JZO54K/166937.7:user/release-keys" PRIVATE_BUILD_DESC="1.29.651.7 CL166937 release-keys"
-
-PRODUCT_COPY_FILES += \
- vendor/xenonhd/proprietary/hybrid/hybrid_m7_no_nav.conf:system/etc/beerbong/properties.conf \
- vendor/xenonhd/proprietary/m7/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/proprietary/hybrid/hybrid_hdpi.conf b/proprietary/hybrid/hybrid_hdpi.conf
index 58d7fec..3e485b4 100644
--- a/proprietary/hybrid/hybrid_hdpi.conf
+++ b/proprietary/hybrid/hybrid_hdpi.conf
@@ -25,8 +25,8 @@
com.android.vending.layout=360
com.android.phone.dpi=240
com.android.phone.layout=360
-com.google.android.gm.dpi=160
-com.google.android.gm.layout=720
-com.google.android.talk.dpi=200
+com.google.android.gm.dpi=240
+com.google.android.gm.layout=360
+com.google.android.talk.dpi=240
com.google.android.talk.layout=360
com.cyanogenmod.lockclock.force=1
\ No newline at end of file
diff --git a/proprietary/hybrid/hybrid_xhdpi.conf b/proprietary/hybrid/hybrid_xhdpi.conf
index 7162ddc..7bc4b8d 100644
--- a/proprietary/hybrid/hybrid_xhdpi.conf
+++ b/proprietary/hybrid/hybrid_xhdpi.conf
@@ -15,7 +15,7 @@
## WORKSPACE PREFERENCES
android.dpi=320
android.layout=0
-com.android.systemui.dpi=290
+com.android.systemui.dpi=320
com.android.systemui.statusbar.dpi=100
com.android.systemui.navbar.dpi=100
com.android.systemui.layout=360
@@ -25,10 +25,10 @@
com.android.vending.layout=360
com.android.phone.dpi=320
com.android.phone.layout=360
-com.android.email.dpi=230
-com.android.email.layout=600
-com.google.android.gm.dpi=250
-com.google.android.gm.layout=600
+com.android.email.dpi=320
+com.android.email.layout=360
+com.google.android.gm.dpi=320
+com.google.android.gm.layout=360
com.google.android.talk.dpi=320
-com.google.android.talk.layout=320
+com.google.android.talk.layout=360
com.cyanogenmod.lockclock.force=1
\ No newline at end of file
diff --git a/proprietary/hybrid/hybrid_xhdpi_no_nav.conf b/proprietary/hybrid/hybrid_xhdpi_no_nav.conf
index b336438..4c32e53 100644
--- a/proprietary/hybrid/hybrid_xhdpi_no_nav.conf
+++ b/proprietary/hybrid/hybrid_xhdpi_no_nav.conf
@@ -15,7 +15,7 @@
## WORKSPACE PREFERENCES
android.dpi=320
android.layout=0
-com.android.systemui.dpi=290
+com.android.systemui.dpi=320
com.android.systemui.statusbar.dpi=100
com.android.systemui.navbar.dpi=0
com.android.systemui.layout=360
@@ -25,10 +25,10 @@
com.android.vending.layout=360
com.android.phone.dpi=320
com.android.phone.layout=360
-com.android.email.dpi=230
-com.android.email.layout=600
-com.google.android.gm.dpi=250
+com.android.email.dpi=320
+com.android.email.layout=360
+com.google.android.gm.dpi=320
com.google.android.gm.layout=360
-com.google.android.talk.dpi=250
+com.google.android.talk.dpi=320
com.google.android.talk.layout=360
com.cyanogenmod.lockclock.force=1
\ No newline at end of file
diff --git a/vendorsetup.sh b/vendorsetup.sh
index c961720..b13de5c 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -8,6 +8,7 @@
add_lunch_combo xenonhd_find5-userdebug
add_lunch_combo xenonhd_galaxysmtd-userdebug
add_lunch_combo xenonhd_grouper-userdebug
+add_lunch_combo xenonhd_i605-userdebug
add_lunch_combo xenonhd_i9100-userdebug
add_lunch_combo xenonhd_i9100g-userdebug
add_lunch_combo xenonhd_i9300-userdebug