Merge "Add Virgin Mobile US to apns-conf.xml." into gingerbread
diff --git a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_0.png b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_0.png
index 112cc73..dc1e856 100644
--- a/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_0.png
+++ b/overlay/ldpi/frameworks/base/core/res/res/drawable-ldpi/stat_sys_battery_0.png
Binary files differ
diff --git a/overlay/legend/packages/apps/CMParts/res/values/config.xml b/overlay/legend/packages/apps/CMParts/res/values/config.xml
index 218180f..93f1eb4 100644
--- a/overlay/legend/packages/apps/CMParts/res/values/config.xml
+++ b/overlay/legend/packages/apps/CMParts/res/values/config.xml
@@ -1,7 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
+ <!-- Whether or not to display the trackball settings -->
<bool name="has_trackball">true</bool>
+
+ <!-- Whether or not to display the camera button settings -->
+ <bool name="has_camera_button">false</bool>
+
<bool name="has_rgb_notification_led">false</bool>
<bool name="has_dual_notification_led">false</bool>
+
+ <!-- LED Flashlight -->
<bool name="has_led_flash">true</bool>
+
+ <!-- Whether or not to display search button settings -->
+ <bool name="has_search_button">true</bool>
</resources>
diff --git a/products/cyanogen_encore.mk b/products/cyanogen_encore.mk
index a8daded..86842cf 100644
--- a/products/cyanogen_encore.mk
+++ b/products/cyanogen_encore.mk
@@ -12,7 +12,7 @@
PRODUCT_DEVICE := encore
PRODUCT_MODEL := NookColor
PRODUCT_MANUFACTURER := bn
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=encore BUILD_ID=GRI40 BUILD_DISPLAY_ID=GRJ22 BUILD_FINGERPRINT=google/passion/passion:2.3.3/GRI40/102588:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.3 GRI40 102588 release-keys"
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=encore BUILD_ID=GRJ22 BUILD_DISPLAY_ID=GRJ22 BUILD_FINGERPRINT=google/passion/passion:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.4 GRJ22 121341 release-keys"
PRODUCT_PACKAGE_OVERLAYS += \
vendor/cyanogen/overlay/tablet \
