Toggles for grouper and d2vzw cleanup
Signed-off-by: iceandfire <arhamjamal@gmail.com>
diff --git a/overlay/common_tablet/packages/apps/ROMSettings/res/values/arrays.xml b/overlay/common_tablet/packages/apps/ROMSettings/res/values/arrays.xml
index de03264..b6f09b6 100644
--- a/overlay/common_tablet/packages/apps/ROMSettings/res/values/arrays.xml
+++ b/overlay/common_tablet/packages/apps/ROMSettings/res/values/arrays.xml
@@ -20,6 +20,9 @@
<item>USBTETHER</item>
<item>QUICKRECORD</item>
<item>NAVBARHIDE</item>
+ <item>SLEEP</item>
+ <item>POWERMENU</item>
+ <item>REBOOT</item>
</string-array>
<string-array name="available_toggles_values" translatable="false">
<item>@string/toggle_user</item>
@@ -40,6 +43,9 @@
<item>@string/toggle_usb_tether</item>
<item>@string/toggle_quickrecord</item>
<item>@string/toggle_navbar_hide</item>
+ <item>@string/toggle_sleep</item>
+ <item>@string/toggle_powermenu</item>
+ <item>@string/toggle_reboot</item>
</string-array>
<string-array name="navigation_bar_qty_entries">
<item>1</item>
diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index 6edf75f..5248c94 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -4,5 +4,6 @@
$(LOCAL_DIR)/xenonhd_maguro.mk \
$(LOCAL_DIR)/xenonhd_mako.mk \
$(LOCAL_DIR)/xenonhd_toro.mk \
- $(LOCAL_DIR)/d2att.mk \
+ $(LOCAL_DIR)/xenonhd_d2att.mk \
+ $(LOCAL_DIR)/xenonhd_d2vzw.mk \
$(LOCAL_DIR)/xenonhd_toroplus.mk \
diff --git a/products/d2vzw.mk b/products/d2vzw.mk
deleted file mode 100644
index 9c1f6a3..0000000
--- a/products/d2vzw.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# Inherit AOSP device configuration for d2vzw.
-$(call inherit-product, device/samsung/d2vzw/full_d2vzw.mk)
-
-# Inherit common product files.
-$(call inherit-product, vendor/xenonhd/products/common.mk)
-
-# Setup device specific product configuration.
-PRODUCT_NAME := xenonhd_d2vzw
-PRODUCT_BRAND := Samsung
-PRODUCT_DEVICE := d2vzw
-PRODUCT_MODEL := SCH-I535
-PRODUCT_MANUFACTURER := Samsung
-
-# Extra d2vzw overlay
-PRODUCT_PACKAGE_OVERLAYS += vendor/xenonhd/overlay/d2vzw
-
-# Copy d2 specific prebuilt files
-PRODUCT_COPY_FILES += \
- vendor/xenonhd/proprietary/d2-common/app/Thinkfree.apk:system/app/Thinkfree.apk \
- vendor/xenonhd/proprietary/d2-common/media/bootanimation.zip:system/media/bootanimation.zip \
- vendor/xenonhd/proprietary/d2-common/media/audio/notifications/Nexus.mp3:system/media/audio/notifications/Nexus.mp3 \
- vendor/xenonhd/proprietary/common/app/Microbes.apk:system/app/Microbes.apk \
- vendor/xenonhd/proprietary/common/app/Torch.apk:system/app/Torch.apk \
- vendor/xenonhd/proprietary/common/lib/libmicrobes_jni.so:system/lib/libmicrobes_jni.so \
- 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 common build.prop overrides
--include vendor/xenonhd/products/common_versions.mk
-
-# Inherit drm blobs
--include vendor/xenonhd/products/common_drm.mk
-
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=d2vzw TARGET_DEVICE=d2vzw BUILD_FINGERPRINT="Verizon/d2vzw/d2vzw:4.0.4/IMM76D/I535VRALHD:user/release-keys" PRIVATE_BUILD_DESC="d2vzw-user 4.0.4 IMM76D I535VRALHD release-keys"
diff --git a/products/xenonhd_d2vzw.mk b/products/xenonhd_d2vzw.mk
index 33d6742..1e4357a 100644
--- a/products/xenonhd_d2vzw.mk
+++ b/products/xenonhd_d2vzw.mk
@@ -19,7 +19,6 @@
vendor/xenonhd/proprietary/d2-common/app/Thinkfree.apk:system/app/Thinkfree.apk \
vendor/xenonhd/proprietary/d2-common/media/bootanimation.zip:system/media/bootanimation.zip \
vendor/xenonhd/proprietary/d2-common/media/audio/notifications/Nexus.mp3:system/media/audio/notifications/Nexus.mp3 \
- vendor/xenonhd/proprietary/common/lib/libmicrobes_jni.so:system/lib/libmicrobes_jni.so \
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
diff --git a/vendorsetup.sh b/vendorsetup.sh
index d59b0a3..e4ccd96 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -3,5 +3,6 @@
add_lunch_combo xenonhd_mako-userdebug
add_lunch_combo xenonhd_grouper-userdebug
add_lunch_combo xenonhd_toro-userdebug
-add_lunch_combo d2att-userdebug
+add_lunch_combo xenonhd_d2att-userdebug
+add_lunch_combo xenonhd_d2vzw-userdebug
add_lunch_combo xenonhd_toroplus-userdebug