Clean up.
Signed-off-by: iceandfire <arhamjamal@gmail.com>
diff --git a/overlay/grouper/packages/apps/ROMControl/res/values/arrays.xml b/overlay/grouper/packages/apps/ROMControl/res/values/arrays.xml
new file mode 100644
index 0000000..6e1292a
--- /dev/null
+++ b/overlay/grouper/packages/apps/ROMControl/res/values/arrays.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+<!-- Generic toggle overlay. Should be set per device in overlay -->
+ <string-array name="available_toggles_entries" translatable="false">
+ <item>USER</item>
+ <item>BRIGHTNESS</item>
+ <item>SETTINGS</item>
+ <item>WIFI</item>
+ <item>ROTATE</item>
+ <item>CLOCK</item>
+ <item>GPS</item>
+ <item>IME</item>
+ <item>BATTERY</item>
+ <item>AIRPLANE_MODE</item>
+ <item>BLUETOOTH</item>
+ <item>SILENT</item>
+ <item>SYNC</item>
+ <item>NFC</item>
+ <item>USBTETHER</item>
+ </string-array>
+ <string-array name="available_toggles_values" translatable="false">
+ <item>@string/toggle_user</item>
+ <item>@string/toggle_brightness</item>
+ <item>@string/toggle_settings</item>
+ <item>@string/toggle_wifi</item>
+ <item>@string/toggle_auto_rotate</item>
+ <item>@string/toggle_clock</item>
+ <item>@string/toggle_gps</item>
+ <item>@string/toggle_ime</item>
+ <item>@string/toggle_battery</item>
+ <item>@string/toggle_airplane_mode</item>
+ <item>@string/toggle_bluetooth</item>
+ <item>@string/toggle_silent</item>
+ <item>@string/toggle_sync</item>
+ <item>@string/toggle_nfc</item>
+ <item>@string/toggle_usb_tether</item>
+ </string-array>
+ <string-array name="navigation_bar_qty_entries">
+ <item>1</item>
+ <item>2</item>
+ <item>3</item>
+ <item>4</item>
+ <item>5</item>
+ <item>6</item>
+ <item>7</item>
+ </string-array>
+ <string-array name="navigation_bar_qty_values" translatable="false">
+ <item>1</item>
+ <item>2</item>
+ <item>3</item>
+ <item>4</item>
+ <item>5</item>
+ <item>6</item>
+ <item>7</item>
+ </string-array>
+</resources>
diff --git a/overlay/grouper/packages/apps/ROMControl/res/values/strings.xml b/overlay/grouper/packages/apps/ROMControl/res/values/strings.xml
new file mode 100644
index 0000000..9ba73ff
--- /dev/null
+++ b/overlay/grouper/packages/apps/ROMControl/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="toggle_default_entries">USER|BRIGHTNESS|SETTINGS|WIFI|ROTATE|BATTERY|AIRPLANE_MODE|BLUETOOTH</string>
+</resources>
diff --git a/products/d2att.mk b/products/d2att.mk
index 9ace29c..01a8574 100644
--- a/products/d2att.mk
+++ b/products/d2att.mk
@@ -19,8 +19,6 @@
vendor/xenonhd/proprietary/tuna/app/Thinkfree.apk:system/app/Thinkfree.apk \
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/app/Microbes.apk:system/app/Microbes.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
diff --git a/products/xenonhd_d2vzw.mk b/products/xenonhd_d2vzw.mk
new file mode 100644
index 0000000..33d6742
--- /dev/null
+++ b/products/xenonhd_d2vzw.mk
@@ -0,0 +1,32 @@
+# 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/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_grouper.mk b/products/xenonhd_grouper.mk
index 3466982..08b917a 100644
--- a/products/xenonhd_grouper.mk
+++ b/products/xenonhd_grouper.mk
@@ -24,7 +24,6 @@
vendor/xenonhd/proprietary/grouper/app/Thinkfree.apk:system/app/Thinkfree.apk \
vendor/xenonhd/proprietary/grouper/media/bootanimation.zip:system/media/bootanimation.zip \
vendor/xenonhd/proprietary/grouper/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/products/xenonhd_maguro.mk b/products/xenonhd_maguro.mk
index d044dec..729c8d6 100644
--- a/products/xenonhd_maguro.mk
+++ b/products/xenonhd_maguro.mk
@@ -27,8 +27,6 @@
vendor/xenonhd/proprietary/tuna/app/Thinkfree.apk:system/app/Thinkfree.apk \
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/app/Microbes.apk:system/app/Microbes.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
diff --git a/products/xenonhd_mako.mk b/products/xenonhd_mako.mk
index 3d5e3fe..f9b87ea 100644
--- a/products/xenonhd_mako.mk
+++ b/products/xenonhd_mako.mk
@@ -24,8 +24,6 @@
vendor/xenonhd/proprietary/tuna/app/Thinkfree.apk:system/app/Thinkfree.apk \
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/app/Microbes.apk:system/app/Microbes.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
diff --git a/products/xenonhd_toro.mk b/products/xenonhd_toro.mk
index 56eb8ad..ffa6640 100644
--- a/products/xenonhd_toro.mk
+++ b/products/xenonhd_toro.mk
@@ -27,8 +27,6 @@
vendor/xenonhd/proprietary/tuna/app/Thinkfree.apk:system/app/Thinkfree.apk \
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/app/Microbes.apk:system/app/Microbes.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
diff --git a/products/xenonhd_toroplus.mk b/products/xenonhd_toroplus.mk
index 625fd61..866b933 100644
--- a/products/xenonhd_toroplus.mk
+++ b/products/xenonhd_toroplus.mk
@@ -27,11 +27,12 @@
vendor/xenonhd/proprietary/tuna/app/Thinkfree.apk:system/app/Thinkfree.apk \
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/app/Microbes.apk:system/app/Microbes.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
+PRODUCT_PACKAGES := \
+GNexusParts
+
# Inherit drm blobs
-include vendor/xenonhd/products/common_drm.mk