diff --git a/README.md b/README.md
index 46473dcb..522aee42 100644
--- a/README.md
+++ b/README.md
@@ -105,7 +105,6 @@ You can create snapshots from this repository.
* `build-package fdroid` to create the F-Droid only package
* `build-package patcher` to create the on-device framework-patcher package
* `build-package uninstaller` to create the uninstaller package
- * `build-package setupwizard` to create the Setup Wizard package
* `build-package bromitewebview` to create the Bromite WebView package
* `build-package osmand` for the OpenStreetMap (OsmAnd) package
* `build-package systest` to create the SysTest package
@@ -285,13 +284,6 @@ The microG and F-Droid packages however can be installed in parallel, as they co
Extra packages, flashing through TWRP required (flashing through Magisk Manager is not supported).
-* **NanoDroid-setupwizard**: includes
- * **AROMA** based Setup Wizard to create the configuration files
- * user can choose where to store the configuration files
- * `/data/media/0` (fallback)
- * `/external_sd`
- * `/data`
- * **NOTE:** AROMA only works on `arm` and `arm64`, if your device is `x86` or `x86_64`, it won't work
* **NanoDroid-uninstaller**: includes
* uninstalls *all* NanoDroid Magisk Modules
* uninstalls NanoDroid installed in System Mode
@@ -486,17 +478,16 @@ NanoDroid includes a variety of OpenSource applications, check full [> list](doc
## Installation
-### Alter Installation
-
-NanoDroid supports altering the installation settings to a wide degree.
-
-Full [> Details](doc/AlterInstallation.md) on altering installation manually, or use the Setup Wizard (if you've got an arm/arm64 device).
-
### Installation Process
#### NanoDroid
-* Use Setup Wizard to create configuration files (if you've got an arm/arm64 device), or create manually (see above)
+* Create the setup configuration, if you don't want to stick with the default setup
+ * see [> Alter Installation](doc/AlterInstallation.md) for configuration settings (all packages)
+ * see [> Applications](doc/Applications.md) for which appliations to install (only Full package)
+ * see [> NanoDroid-Overlay](doc/NanoDroid-Overlay.md) for which applications to (pseudo-)debloat (only Full and microG packages)
+ * note: all GApps that conflict with microG will be (pseudo-)debloated regardless of you choice here
+ * see [> GApps Removal List](doc/GAppsRemoval.md) to see which GApps are auto-destroyed
* Download pre-built zip or create one from this repository
##### Installing from scratch
diff --git a/SetupWizard/ChangeLog.md b/SetupWizard/ChangeLog.md
deleted file mode 120000
index 41c10a61..00000000
--- a/SetupWizard/ChangeLog.md
+++ /dev/null
@@ -1 +0,0 @@
-../ChangeLog.md
\ No newline at end of file
diff --git a/SetupWizard/META-INF/com/google/android/aroma-config b/SetupWizard/META-INF/com/google/android/aroma-config
deleted file mode 100644
index 1ef55f87..00000000
--- a/SetupWizard/META-INF/com/google/android/aroma-config
+++ /dev/null
@@ -1,263 +0,0 @@
-ini_set("rom_name", "NanoDroid SetupWizard");
-ini_set("rom_version", "22.8");
-ini_set("rom_author", "Nanolx");
-ini_set("rom_device", "Generic (LOS/AOSP)");
-ini_set("rom_date", "20200901");
-
-ini_set("force_colorspace","rgba");
-splash(2000, "nanolx");
-fontresload( "0", "ttf/Roboto-Regular.ttf", "12" );
-fontresload( "1", "ttf/Roboto-Regular.ttf", "18" );
-theme("touchwiz");
-
-viewbox(
- "Welcome",
- "Relevant information of the Package:\n\n"+
- " Rom\t <#selectbg_g>"+ini_get("rom_name")+"\n"+
- " Version\t <#selectbg_g>"+ini_get("rom_version")+"\n"+
- " Date\t <#selectbg_g>"+ini_get("rom_date")+"\n\n"+
- " Device\t <#f00>"+ini_get("rom_device")+"\n\n\n",
- "@welcome"
-);
-
-agreebox(
- "Terms Of Use",
- "<@center>Please read the NanoDroid terms of use",
- "@license",
- "<@center>" + readfile_aroma("license.txt") + "",
- "I agree with these terms of use",
- "<@center>You must accept the terms"
-);
-
-selectbox(
- "Configuration Location",
- "Configuration Location",
- "@customize",
- "location.prop",
-
- "Where to store configuration", "", 2, #-- Group 1. key = "selected.1"
- "/data/media/0", "Internal Storage (wipe-safe)", 1, #-- selected.1 = 1
- "/external_sd", "External SD Card (if any)", 0, #-- selected.1 = 2
- "/data", "Data Storage (not wipe-safe) ", 0 #-- selected.1 = 3
-);
-
-checkbox(
- "Generic Setup",
- "Generic Setup",
- "@customize",
- "setup.prop",
-
- "Adjust the basic settings", "", 2, #-- Group 1
- "Apps", "Install Apps (customized later)", 1,
- "Overlay", "Debloat Apps (customized later)", 1,
- "Maps API v1", "Install Google Maps API version 1", 1,
- "Force System", "Force System Mode Installation", 0,
- "GNU Bash", "Install GNU Bash Shell", 1
-);
-
-selectbox(
- "microG",
- "microG",
- "@customize",
- "ug.prop",
-
- "Select whether to install microG", "", 2, #-- Group 1. key = "selected.1"
- "None", "Don't install microG (does not effect NanoDroid-microG)", 0, #-- selected.1 = 1
- "Full", "Install microG [GmsCore, GsfProxy, DroidGuard Helper, Nominatim]", 1, #-- selected.1 = 2
- "Minimal", "Install microG [GmsCore, Nominatim]", 0 #-- selected.1 = 3
-);
-
-checkbox(
- "nlpBackends",
- "nlpBackends",
- "@customize",
- "nlp.prop",
-
- "Select the location backends for microG", "", 2, #-- Group 1
- "Déjà Vu", "Install Déjà Vu backend", 1,
- "Ichnaea", "Install Mozilla backend", 0,
- "Apple", "Install Apple backend", 0,
- "Radiocell", "Install Radiocells.org backend", 0
-);
-
-selectbox(
- "F-Droid",
- "F-Droid",
- "@customize",
- "fd.prop",
-
- "Select whether to install F-Droid", "", 2, #-- Group 1. key = "selected.1"
- "None", "Don't install F-Droid (does not effect NanoDroid-FDroid)", 0, #-- selected.1 = 1
- "Official", "Install official F-Droid client", 0, #-- selected.1 = 2
- "Aurora Droid", "Install unofficial Aurora Droid client", 1, #-- selected.1 = 3
- "Both", "Install both official and Aurora F-Droid client", 0 #-- selected.1 = 4
-);
-
-selectbox(
- "Google App Store",
- "Google App Store",
- "@customize",
- "store.prop",
-
- "Select the Google App Store you want", "", 2, #-- Group 1. key = "selected.1"
- "None", "Install no Google App Store", 0, #-- selected.1 = 1
- "Play Store (patched)", "Install patched Play Store with microG (in-)app-purchase support", 0, #-- selected.1 = 2
- "Aurora Store", "Install alternative Aurora Store", 0, #-- selected.1 = 3
- "Fake Store", "Install Fake Store only", 0, #-- selected.1 = 4
- "Aurora + Fake Store", "Install alternative Aurora Store (and Fake Store)", 1, #-- selected.1 = 5
- "PLay + Aurora Store", "Install both Play Store and Aurora Store", 0 #-- selected.1 = 6
-);
-
-checkbox(
- "Google Sync/Swipe",
- "Google Sync/Swipe",
- "@customize",
- "gsync.prop",
-
- "Select the Google Addons you want", "", 2, #-- Group 1
- "Google Sync", "Install Google Contacts & Calendar Sync", 0,
- "Swipe", "Install Swipe libraries", 0
-);
-
-checkbox(
- "Init Scripts",
- "Init Scripts",
- "@customize",
- "initd.prop",
-
- "Select the Init Scripts you want", "", 2, #-- Group 1
- "sqlite", "cleanup and compress sqlite databases on boot", 1,
- "fstrim", "optmize/trim file systems on boot", 1,
- "logcat", "auto record logcats in /data/adb/logcats", 1,
- "external_sd", "link sdcard to /external_sd for easy adb access", 1,
- "logscleaner", "cleanup log files on boot", 0
-);
-
-checkbox(
- "Shell Utilities",
- "Shell Utilities",
- "@customize",
- "shellutil.prop",
-
- "Select the Shell utilities you want", "", 2, #-- #-- Group 1
- "findfs", "---", 1,
- "findmnt", "---", 1,
- "hexdump", "---", 1,
- "lessecho", "---", 1,
- "lesskey", "---", 1,
- "lsblk", "---", 1,
- "lscpu", "---", 1,
- "lsipc", "---", 1,
- "lslocks", "---", 1,
- "lsns", "---", 1,
- "ncal", "---", 1,
- "whereis", "---", 1
-);
-
-checkbox(
- "App Setup",
- "App Setup",
- "@customize",
- "apps.prop",
-
- "Select which Apps to install (if enabled)", "", 2, #-- Group 1
- "Alarmio", "Alarm Clock without pre-alerts", 1,
- "Amaze", "Amazing File Manager", 1,
- "AnysoftKeyboard", "Powerful Keyboard", 1,
- "Blokada", "Powerful ad blocker (rootless)", 1,
- "Frost", "Facebook client", 1,
- "HackersKeyboard", "Powerful developer Keyboard", 1,
- "K9Mail", "Powerful Mail client", 1,
- "KeePassDX", "Password Safe", 1,
- "MPV", "Video Player", 1,
- "NewPipe", "YouTube frontend and downloader", 1,
- "OAndBackupX", "Backup and Restore Apps", 1,
- "Odyssey", "Feature-Rich Music Player", 1,
- "OpenCamera", "Feature-Rich Camera", 1,
- "OpenKeyChain", "Encrypt or Sign E-Mails", 1,
- "OpenLauncher", "Customizable Launcher", 1,
- "OpenVPN", "Connect to VPNs", 1,
- "Tor Browser", "Modified Firefox for TOR", 1,
- "Privacy Browser", "Secure, Open Source Browser", 1,
- "QKSMS", "Great SMS / MMS messenger", 1,
- "SimpleCalendar", "Easy to use Calendar", 1,
- "SimpleGallery", "Easy to use Gallery", 1,
- "SmartPack-Kernel-Manager", "Customize Kernel Settings", 1,
- "Termux", "Powerful Terminal Emulator", 1,
- "Twidere", "Customizable Twitter Client", 1,
- "XDALabs", "XDA at the palm of your hands", 1
-);
-
-checkbox(
- "Debloat Setup",
- "Debloat Setup",
- "@customize",
- "debloat.prop",
-
- "Select which Apps to Debloat (if enabled)", "", 2, #-- Group 1
- "BasicDreams", "Screensaver", 1,
- "Browser", "Standard Browser", 1,
- "Calendar", "Standard Calendar", 1,
- "Camera2", "Standard Camera", 1,
- "CMFileManager", "Cyanogen File Manager", 1,
- "DeskClock", "Stock Clock app", 1,
- "Eleven", "Standard Music Player", 1,
- "Email", "Standard Mail Program", 1,
- "Exchange2", "Exchange Services (Email)", 1,
- "FMRadio", "FM Radio/Tuner", 1,
- "Gallery2", "Standard Gallery", 1,
- "Gello", "Cyanogen Browser", 1,
- "Jelly", "LineAge Browser", 1,
- "messaging", "Standard SMS/MMS Program", 1,
- "mGerrit", "Bug Tracker", 1,
- "OmniSwitch", "OmniROM App Switcher", 1,
- "Phonograph", "Music Player", 1,
- "PhotoTable", "Screensaver", 1,
- "Recorder", "Sound Recorder", 1,
- "ResurrectionStats", "RR Statistics", 1,
- "Screencast", "Screen Recorder", 1,
- "Slimperience", "Web Browser", 1,
- "Snap", "Camera", 1,
- "SnapdragonCamera", "Snapdragon optmized Camera", 1,
- "SoundRecorder", "Sound Recorder", 1,
- "Stk", "SIM Card ToolKit", 1,
- "ViaBrowser", "Web Browser", 1,
- "Wallpaper", "Wallpaper App (Google)", 1,
- "WallpaperBackup", "Wallpaper Backup (Google)", 1,
- "WallpaperPickerGoogle", "Wallpaper App (Google)", 1
-);
-
-menubox(
- "NanoDroid SetupWizard",
- "<@center>Ready to create configuration.",
- "@update",
- "menu.prop",
- "Create Configuration", "", "@install",
- "Abort SetupWizard", "", "@exit"
-);
-
-if prop("menu.prop","selected")=="2"
-then
- exit("");
-endif;
-
-setvar("retstatus",
- install(
- "Creating Configuration...",
- "<@center>"+ini_get("rom_name")+"",
- "");
-);
-
-ini_set("text_next", "Finish");
-
-if getvar("retstatus")=="0" then
- viewbox(
- "Installation Completed",
- "<@center>\nCongratulations!\n\n"+
- "NanoDroid Configuration successfully created.",
- "");
-else
- viewbox("Installation Failed",
- "\n\SetupWizard Status: "+ getvar("retstatus"),
- "@alert");
-endif;
diff --git a/SetupWizard/META-INF/com/google/android/aroma/changelog.txt b/SetupWizard/META-INF/com/google/android/aroma/changelog.txt
deleted file mode 100644
index ebe1dd0b..00000000
--- a/SetupWizard/META-INF/com/google/android/aroma/changelog.txt
+++ /dev/null
@@ -1 +0,0 @@
-onzin
\ No newline at end of file
diff --git a/SetupWizard/META-INF/com/google/android/aroma/icons/agreement.png b/SetupWizard/META-INF/com/google/android/aroma/icons/agreement.png
deleted file mode 100644
index e3bbe5ef..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/icons/agreement.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/icons/alert.png b/SetupWizard/META-INF/com/google/android/aroma/icons/alert.png
deleted file mode 100644
index 155906f8..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/icons/alert.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/icons/alliance.png b/SetupWizard/META-INF/com/google/android/aroma/icons/alliance.png
deleted file mode 100644
index b811ec1c..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/icons/alliance.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/icons/apps.png b/SetupWizard/META-INF/com/google/android/aroma/icons/apps.png
deleted file mode 100644
index ca75fff1..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/icons/apps.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/icons/back.png b/SetupWizard/META-INF/com/google/android/aroma/icons/back.png
deleted file mode 100644
index d88e36fb..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/icons/back.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/icons/confirm.png b/SetupWizard/META-INF/com/google/android/aroma/icons/confirm.png
deleted file mode 100644
index 1fdb5d0f..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/icons/confirm.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/icons/customize.png b/SetupWizard/META-INF/com/google/android/aroma/icons/customize.png
deleted file mode 100644
index b8726909..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/icons/customize.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/icons/default.png b/SetupWizard/META-INF/com/google/android/aroma/icons/default.png
deleted file mode 100644
index 1c728449..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/icons/default.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/icons/finish.png b/SetupWizard/META-INF/com/google/android/aroma/icons/finish.png
deleted file mode 100644
index 2b82c65d..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/icons/finish.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/icons/info.png b/SetupWizard/META-INF/com/google/android/aroma/icons/info.png
deleted file mode 100644
index 90384fe4..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/icons/info.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/icons/install.png b/SetupWizard/META-INF/com/google/android/aroma/icons/install.png
deleted file mode 100644
index 44caaf5d..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/icons/install.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/icons/installbutton.png b/SetupWizard/META-INF/com/google/android/aroma/icons/installbutton.png
deleted file mode 100644
index 450808e0..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/icons/installbutton.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/icons/license.png b/SetupWizard/META-INF/com/google/android/aroma/icons/license.png
deleted file mode 100644
index 2f063553..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/icons/license.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/icons/menu.png b/SetupWizard/META-INF/com/google/android/aroma/icons/menu.png
deleted file mode 100644
index ce48992b..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/icons/menu.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/icons/next.png b/SetupWizard/META-INF/com/google/android/aroma/icons/next.png
deleted file mode 100644
index 8c9656f6..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/icons/next.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/icons/personalize.png b/SetupWizard/META-INF/com/google/android/aroma/icons/personalize.png
deleted file mode 100644
index c6f67980..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/icons/personalize.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/icons/update.png b/SetupWizard/META-INF/com/google/android/aroma/icons/update.png
deleted file mode 100644
index 29b18ee2..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/icons/update.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/icons/welcome.png b/SetupWizard/META-INF/com/google/android/aroma/icons/welcome.png
deleted file mode 100644
index 1b5e27fc..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/icons/welcome.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/license.txt b/SetupWizard/META-INF/com/google/android/aroma/license.txt
deleted file mode 100644
index be6a3bd1..00000000
--- a/SetupWizard/META-INF/com/google/android/aroma/license.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-<@center><#selectbg_g>Terms of Use
-
-<@left>By using this package, you take full responsibility of it's use, I (Nanolx) am not responsible of any damage this package may cause to your device.
-
-<@center><#selectbg_g>Read before installation
-
-<@left>Welcome to the NanoDroid Setup Wizard.
-
-With this AROMA installer you will create NanoDroid configuration files.
-
-You need to flash any of the modules afterwards!
diff --git a/SetupWizard/META-INF/com/google/android/aroma/nanolx.png b/SetupWizard/META-INF/com/google/android/aroma/nanolx.png
deleted file mode 100644
index f2c6da7a..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/nanolx.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/bg.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/bg.png
deleted file mode 100644
index dfb3a283..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/bg.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/button.9.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/button.9.png
deleted file mode 100644
index cca7f95f..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/button.9.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/button_focus.9.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/button_focus.9.png
deleted file mode 100644
index ff932bd8..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/button_focus.9.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/button_press.9.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/button_press.9.png
deleted file mode 100644
index b1cb208c..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/button_press.9.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/cb.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/cb.png
deleted file mode 100644
index cd5a8c79..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/cb.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/cb_focus.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/cb_focus.png
deleted file mode 100644
index c3e627e8..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/cb_focus.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/cb_on.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/cb_on.png
deleted file mode 100644
index d44c1c2b..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/cb_on.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/cb_on_focus.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/cb_on_focus.png
deleted file mode 100644
index f5d669e6..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/cb_on_focus.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/cb_on_press.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/cb_on_press.png
deleted file mode 100644
index 1bcf3005..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/cb_on_press.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/cb_press.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/cb_press.png
deleted file mode 100644
index c5924d59..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/cb_press.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/dialog.9.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/dialog.9.png
deleted file mode 100644
index 901f20e3..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/dialog.9.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/dialog_titlebar.9.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/dialog_titlebar.9.png
deleted file mode 100644
index 34546701..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/dialog_titlebar.9.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/font.roboto.big.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/font.roboto.big.png
deleted file mode 100644
index d7d805c3..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/font.roboto.big.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/font.roboto.small.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/font.roboto.small.png
deleted file mode 100644
index 94f6b5dd..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/font.roboto.small.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.agreement.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.agreement.png
deleted file mode 100644
index 6bb78f91..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.agreement.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.alert.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.alert.png
deleted file mode 100644
index 328c55b7..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.alert.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.apps.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.apps.png
deleted file mode 100644
index ed463c2e..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.apps.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.back.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.back.png
deleted file mode 100644
index 5254feef..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.back.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.confirm.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.confirm.png
deleted file mode 100644
index 4450193f..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.confirm.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.customize.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.customize.png
deleted file mode 100644
index 733b3684..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.customize.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.default.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.default.png
deleted file mode 100644
index dc9bcb37..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.default.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.exit.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.exit.png
deleted file mode 100644
index a9b03764..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.exit.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.info.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.info.png
deleted file mode 100644
index aaca3515..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.info.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.install.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.install.png
deleted file mode 100644
index 9f44623b..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.install.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.installbutton.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.installbutton.png
deleted file mode 100644
index 5d63ed2a..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.installbutton.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.license.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.license.png
deleted file mode 100644
index e0796591..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.license.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.menu.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.menu.png
deleted file mode 100644
index 532dd66e..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.menu.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.modem.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.modem.png
deleted file mode 100644
index 413a801f..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.modem.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.next.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.next.png
deleted file mode 100644
index 11f2d3ea..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.next.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.personalize.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.personalize.png
deleted file mode 100644
index c95e0028..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.personalize.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.reboot.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.reboot.png
deleted file mode 100644
index 363449bd..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.reboot.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.recovery.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.recovery.png
deleted file mode 100644
index 6aa43ba2..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.recovery.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.update.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.update.png
deleted file mode 100644
index 58da527a..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.update.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.welcome.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.welcome.png
deleted file mode 100644
index 5d510ca8..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.welcome.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/list.9.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/list.9.png
deleted file mode 100644
index 68f0b631..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/list.9.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/navbar.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/navbar.png
deleted file mode 100644
index b3c7f73b..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/navbar.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/radio.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/radio.png
deleted file mode 100644
index fa6fec23..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/radio.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/radio_focus.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/radio_focus.png
deleted file mode 100644
index f45d676e..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/radio_focus.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/radio_on.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/radio_on.png
deleted file mode 100644
index 86c499f4..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/radio_on.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/radio_on_focus.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/radio_on_focus.png
deleted file mode 100644
index eedc4dff..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/radio_on_focus.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/radio_on_press.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/radio_on_press.png
deleted file mode 100644
index 8cfe1d96..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/radio_on_press.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/radio_press.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/radio_press.png
deleted file mode 100644
index cceaeaa0..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/radio_press.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/theme.prop b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/theme.prop
deleted file mode 100644
index 2d55dbbf..00000000
--- a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/theme.prop
+++ /dev/null
@@ -1,67 +0,0 @@
-img.background=bg
-img.titlebar=titlebar.9
-img.navbar=navbar
-img.dialog=dialog.9
-img.dialog.titlebar=dialog_titlebar.9
-img.progress=button.9
-img.prograss.fill=button_press.9
-img.selection=list.9
-img.selection.push=list.9
-img.button=button.9
-img.button.focus=button_focus.9
-img.button.push=button_press.9
-img.checkbox=cb
-img.checkbox.focus=cb_focus
-img.checkbox.push=cb_press
-img.checkbox.on=cb_on
-img.checkbox.on.focus=cb_on_focus
-img.checkbox.on.push=cb_on_press
-img.radio=radio
-img.radio.focus=radio_focus
-img.radio.push=radio_press
-img.radio.on=radio_on
-img.radio.on.focus=radio_on_focus
-img.radio.on.push=radio_on_press
-
-
-color.winbg = #000
-color.winbg_g = #444
-color.winfg = #fff
-color.winfg_gray = #666
-color.dialogbg = #000
-color.dialogbg_g = #444
-color.dialogfg = #fff
-color.textbg = #000
-color.textfg = #fff
-color.textfg_gray = #aaa
-color.controlbg = #999
-color.controlbg_g = #999
-color.controlfg = #fff
-color.selectbg = #33b5e5
-color.selectbg_g = #33b5e5
-color.selectfg = #fff
-color.titlebg = #000
-color.titlebg_g = #000
-color.titlefg = #fff
-color.dlgtitlebg = #fff
-color.dlgtitlebg_g = #000
-color.dlgtitlefg = #fff
-color.scrollbar = #ccc
-color.navbg = #000
-color.navbg_g = #000
-color.border = #666
-color.border_g = #666
-color.progressglow = #33b5e5
-
-config.roundsize = 1
-config.button_roundsize = 1
-config.window_roundsize = 1
-config.transition_frame = 5
-
-font.small = font.roboto.small
-font.big = font.roboto.big
-
-
-info.themename = Touchwiz
-info.description = Touchwiz Theme for AROMA Installer
-info.author = titanic_fanatic
\ No newline at end of file
diff --git a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/titlebar.9.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/titlebar.9.png
deleted file mode 100644
index af09ffb2..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/titlebar.9.png and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/aroma/ttf/Roboto-Regular.ttf b/SetupWizard/META-INF/com/google/android/aroma/ttf/Roboto-Regular.ttf
deleted file mode 100755
index 43b3c4fa..00000000
Binary files a/SetupWizard/META-INF/com/google/android/aroma/ttf/Roboto-Regular.ttf and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/update-binary b/SetupWizard/META-INF/com/google/android/update-binary
deleted file mode 100644
index 1f65be78..00000000
Binary files a/SetupWizard/META-INF/com/google/android/update-binary and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/update-binary-installer b/SetupWizard/META-INF/com/google/android/update-binary-installer
deleted file mode 100644
index 43a2d461..00000000
Binary files a/SetupWizard/META-INF/com/google/android/update-binary-installer and /dev/null differ
diff --git a/SetupWizard/META-INF/com/google/android/updater-script b/SetupWizard/META-INF/com/google/android/updater-script
deleted file mode 100644
index 58d80e09..00000000
--- a/SetupWizard/META-INF/com/google/android/updater-script
+++ /dev/null
@@ -1,5 +0,0 @@
-set_progress(0.0);
-package_extract_file("nanodroid-setup", "/tmp/nanodroid-setup");
-set_perm(0, 0, 0777, "/tmp/nanodroid-setup");
-run_program("/tmp/nanodroid-setup");
-set_progress(1.0);
diff --git a/SetupWizard/README.md b/SetupWizard/README.md
deleted file mode 120000
index 32d46ee8..00000000
--- a/SetupWizard/README.md
+++ /dev/null
@@ -1 +0,0 @@
-../README.md
\ No newline at end of file
diff --git a/SetupWizard/nanodroid-setup b/SetupWizard/nanodroid-setup
deleted file mode 100644
index 81190d25..00000000
--- a/SetupWizard/nanodroid-setup
+++ /dev/null
@@ -1,292 +0,0 @@
-#!/sbin/sh
-
-OUTFD=2
-CONF_BACKUP="/data/media/0/nanodroid_backups/config_$(date +%Y%m%d-%H.%M.%S)"
-VERSION=22.8.20200901
-
-ui_print() {
- echo -n -e "ui_print $1\n" >> /proc/self/fd/$OUTFD
- echo -n -e "ui_print\n" >> /proc/self/fd/$OUTFD
-}
-
-is_mounted() {
- if [ ! -z "$2" ]; then
- cat /proc/mounts | grep $1 | grep $2, >/dev/null
- else
- cat /proc/mounts | grep $1 >/dev/null
- fi
- return $?
-}
-
-setup_add () {
- if grep -q "item.1.${1}=1" "${setup_prop}"; then
- ui_print " <>> enable property: ${2}"
- echo "${2}=1" >> "${nanodroid_setup}"
- else
- ui_print " <>> disable property: ${2}"
- echo "${2}=0" >> "${nanodroid_setup}"
- fi
-}
-
-apps_add () {
- if grep -q "item.1.${1}=1" "${apps_prop}"; then
- ui_print " <>> mark for installation: ${2}"
- echo "${2}" >> "${nanodroid_apps}"
- fi
-}
-
-overlay_add () {
- if grep -q "item.1.${1}=1" "${debloat_prop}"; then
- ui_print " <>> mark for debloating: ${2}"
- echo "${2}" >> "${nanodroid_overlay}"
- fi
-}
-
-aromapath="/tmp/aroma-data"
-setup_prop="${aromapath}/setup.prop"
-store_prop="${aromapath}/store.prop"
-apps_prop="${aromapath}/apps.prop"
-debloat_prop="${aromapath}/debloat.prop"
-location_prop="${aromapath}/location.prop"
-nlp_prop="${aromapath}/nlp.prop"
-ug_prop="${aromapath}/ug.prop"
-fd_prop="${aromapath}/fd.prop"
-sh_prop="${aromapath}/shellutil.prop"
-init_prop="${aromapath}/initd.prop"
-sync_prop="${aromapath}/gsync.prop"
-
-ui_print " "
-ui_print "****************************"
-ui_print " NanoDroid "
-ui_print " Setup Wizard "
-ui_print " ${VERSION} "
-ui_print "****************************"
-ui_print " "
-
-ui_print " > Creating Configuration files"
-
-if (is_mounted /data); then
- mount -orw,remount /data >/dev/null
-else mount -orw /data >/dev/null
-fi
-
-if grep -q "selected.1=1" "${location_prop}"; then
- ui_print " > saving configuration in: /data/media/0"
- configpath="/data/media/0"
-elif grep -q "selected.1=2" "${location_prop}"; then
- if [ -d "/external_sd" ]; then
- ui_print " > saving configuration in: /external_sd"
- configpath="/external_sd"
- elif [ -d "/sdcard1" ]; then
- ui_print " > saving configuration in: /sdcard1"
- configpath="/sdcard1"
- else
- ui_print " > saving configuration in: /data/media/0"
- configpath="/data/media/0"
- fi
-elif grep -q "selected.1=3" "${location_prop}"; then
- ui_print " > saving configuration in: /data"
- configpath="/data"
-fi
-
-nanodroid_apps="${configpath}/.nanodroid-apps"
-nanodroid_overlay="${configpath}/.nanodroid-overlay"
-nanodroid_setup="${configpath}/.nanodroid-setup"
-
-for setupfile in ${nanodroid_apps} ${nanodroid_overlay} ${nanodroid_setup}; do
- if [ -f ${setupfile} ]; then
- mkdir -p "${CONF_BACKUP}"
- mv "${setupfile}" "${CONF_BACKUP}"
- fi
-
- touch ${setupfile}
-done
-
-ui_print " "
-ui_print " < Installer Configuration"
-
-setup_add 1 nanodroid_apps
-setup_add 2 nanodroid_overlay
-setup_add 3 nanodroid_mapsv1
-setup_add 4 nanodroid_forcesystem
-setup_add 5 nanodroid_bash
-
-if grep -q "selected.1=1" "${store_prop}"; then
- ui_print " <>> setting property: nanodroid_play [None]"
- echo "nanodroid_play=00" >> "${nanodroid_setup}"
-elif grep -q "selected.1=2" "${store_prop}"; then
- ui_print " <>> setting property: nanodroid_play [Play Store]"
- echo "nanodroid_play=10" >> "${nanodroid_setup}"
-elif grep -q "selected.1=3" "${store_prop}"; then
- ui_print " <>> setting property: nanodroid_play [Aurora Store]"
- echo "nanodroid_play=20" >> "${nanodroid_setup}"
-elif grep -q "selected.1=4" "${store_prop}"; then
- ui_print " <>> setting property: nanodroid_play [Fake Store]"
- echo "nanodroid_play=01" >> "${nanodroid_setup}"
-elif grep -q "selected.1=5" "${store_prop}"; then
- ui_print " <>> setting property: nanodroid_play [Aurora + Fake Store]"
- echo "nanodroid_play=21" >> "${nanodroid_setup}"
-elif grep -q "selected.1=6" "${store_prop}"; then
- ui_print " <>> setting property: nanodroid_play [Play + Aurora Store]"
- echo "nanodroid_play=30" >> "${nanodroid_setup}"
-fi
-
-if grep -q "item.1.1=1" "${nlp_prop}"; then
- nlp_Dejavu=1
-else nlp_Dejavu=0
-fi
-
-if grep -q "item.1.2=1" "${nlp_prop}"; then
- nlp_Ichnaea=1
-else nlp_Ichnaea=0
-fi
-
-if grep -q "item.1.3=1" "${nlp_prop}"; then
- nlp_Apple=1
-else nlp_Apple=0
-fi
-
-if grep -q "item.1.4=1" "${nlp_prop}"; then
- nlp_Radiocell=1
-else nlp_Radiocell=0
-fi
-
-ui_print " <<> nanodroid_nlpackend [Dejavu: ${nlp_Dejavu}|Ichnaea: ${nlp_Ichnaea}|Apple: ${nlp_Apple}|Radiocell: ${nlp_Radiocell}]"
-echo "nanodroid_nlpbackend=${nlp_Dejavu}${nlp_Ichnaea}${nlp_Apple}${nlp_Radiocell}" >> "${nanodroid_setup}"
-
-if grep -q "selected.1=1" "${ug_prop}"; then
- ui_print " <>> setting property: nanodroid_microg [None]"
- echo "nanodroid_microg=0" >> "${nanodroid_setup}"
-elif grep -q "selected.1=2" "${ug_prop}"; then
- ui_print " <>> setting property: nanodroid_microg [Full]"
- echo "nanodroid_microg=1" >> "${nanodroid_setup}"
-elif grep -q "selected.1=3" "${ug_prop}"; then
- ui_print " <>> setting property: nanodroid_microg [Minimal]"
- echo "nanodroid_microg=2" >> "${nanodroid_setup}"
-fi
-
-if grep -q "selected.1=1" "${fd_prop}"; then
- ui_print " <>> setting property: nanodroid_fdroid [None]"
- echo "nanodroid_fdroid=0" >> "${nanodroid_setup}"
-elif grep -q "selected.1=2" "${fd_prop}"; then
- ui_print " <>> setting property: nanodroid_fdroid [Official]"
- echo "nanodroid_fdroid=1" >> "${nanodroid_setup}"
-elif grep -q "selected.1=3" "${fd_prop}"; then
- ui_print " <>> setting property: nanodroid_fdroid [Aurora Droid]"
- echo "nanodroid_fdroid=2" >> "${nanodroid_setup}"
-elif grep -q "selected.1=4" "${fd.prop}"; then
- ui_print " <>> setting property: nanodroid_fdroid [Official + Aurora Droid]"
- echo "nanodroid_fdroid=3" >> "${nanodroid_setup}"
-fi
-
-if grep -q "item.1.1=1" "${sync_prop}"; then
- ui_print " <<> setting property: nanodroid_gsync=1"
- echo "nanodroid_gsync=1" >> "${nanodroid_setup}"
-else
- ui_print " <<> setting property: nanodroid_gsync=0"
- echo "nanodroid_gsync=0" >> "${nanodroid_setup}"
-fi
-
-if grep -q "item.1.2=1" "${sync_prop}"; then
- ui_print " <<> setting property: nanodroid_swipe=1"
- echo "nanodroid_swipe=1" >> "${nanodroid_setup}"
-else
- ui_print " <<> setting property: nanodroid_swipe=0"
- echo "nanodroid_swipe=0" >> "${nanodroid_setup}"
-fi
-
-i_scripts=""
-grep -q "item.1.1=1" "${init_prop}" && i_scripts="${i_scripts} 10_sqlite"
-grep -q "item.1.2=1" "${init_prop}" && i_scripts="${i_scripts} 20_fstrim"
-grep -q "item.1.3=1" "${init_prop}" && i_scripts="${i_scripts} 30_logcat"
-grep -q "item.1.4=1" "${init_prop}" && i_scripts="${i_scripts} 40_external_sd"
-grep -q "item.1.5=1" "${init_prop}" && i_scripts="${i_scripts} 50_logscleaner"
-
-ui_print " <<> selected init scripts: ${i_scripts}"
-echo "nanodroid_init=\"${i_scripts}\"" >> "${nanodroid_setup}"
-
-s_utils=""
-grep -q "item.1.1=1" "${sh_prop}" && s_utils="${s_utils} findfs"
-grep -q "item.1.2=1" "${sh_prop}" && s_utils="${s_utils} findmnt"
-grep -q "item.1.3=1" "${sh_prop}" && s_utils="${s_utils} hexdump"
-grep -q "item.1.4=1" "${sh_prop}" && s_utils="${s_utils} lessecho"
-grep -q "item.1.5=1" "${sh_prop}" && s_utils="${s_utils} lesskey"
-grep -q "item.1.6=1" "${sh_prop}" && s_utils="${s_utils} lsblk"
-grep -q "item.1.7=1" "${sh_prop}" && s_utils="${s_utils} lscpu"
-grep -q "item.1.8=1" "${sh_prop}" && s_utils="${s_utils} lsipc"
-grep -q "item.1.9=1" "${sh_prop}" && s_utils="${s_utils} lslocks"
-grep -q "item.1.10=1" "${sh_prop}" && s_utils="${s_utils} lsns"
-grep -q "item.1.11=1" "${sh_prop}" && s_utils="${s_utils} ncal"
-grep -q "item.1.12=1" "${sh_prop}" && s_utils="${s_utils} whereis"
-
-ui_print " <<> selected shell utils: ${s_utils}"
-echo "nanodroid_utils=\"${s_utils}\"" >> "${nanodroid_setup}"
-
-ui_print " "
-ui_print " < Installed Applications"
-
-apps_add 1 Alarmio
-apps_add 2 Amaze
-apps_add 3 AnysoftKeyboard
-apps_add 4 Blokada
-apps_add 5 Frost
-apps_add 6 HackersKeyboard
-apps_add 7 K9Mail
-apps_add 8 KeePassDX
-apps_add 9 MPV
-apps_add 10 NewPipe
-apps_add 11 OAndBackupX
-apps_add 12 Odyssey
-apps_add 13 OpenCamera
-apps_add 14 OpenKeyChain
-apps_add 15 OpenLauncher
-apps_add 16 OpenVPN
-apps_add 17 TorBrowser
-apps_add 18 PrivacyBrowser
-apps_add 19 QKSMS
-apps_add 20 SimpleCalendar
-apps_add 21 SimpleGallery
-apps_add 22 SmartPackKernelManager
-apps_add 23 Termux
-apps_add 24 Twidere
-apps_add 25 XDALabs
-
-ui_print " "
-ui_print " < Debloated Applications"
-
-overlay_add 1 BasicDreams
-overlay_add 2 Browser
-overlay_add 3 Calendar
-overlay_add 4 Camera2
-overlay_add 5 CMFileManager
-overlay_add 6 DeskClock
-overlay_add 7 Eleven
-overlay_add 8 Email
-overlay_add 9 Exchange2
-overlay_add 10 FMRadio
-overlay_add 11 Gallery2
-overlay_add 12 Gello
-overlay_add 13 Jelly
-overlay_add 14 messaging
-overlay_add 15 mGerrit
-overlay_add 16 OmniSwitch
-overlay_add 17 Phonograph
-overlay_add 18 PhotoTable
-overlay_add 19 Recorder
-overlay_add 20 ResurrectionStats
-overlay_add 21 Screencast
-overlay_add 22 Slimperience
-overlay_add 23 Snap
-overlay_add 24 SnapdragonCamera
-overlay_add 25 SoundRecorder
-overlay_add 26 Stk
-overlay_add 27 ViaBrowser
-overlay_add 28 Wallpaper
-overlay_add 29 WallpaperBackup
-overlay_add 30 WallpaperPickerGoogle
-
-ui_print " "
-ui_print " >> Now flash the NanoDroid package of your choice!"
-ui_print " "
-ui_print " > Thanks for using NanoDroid"
-ui_print " "
diff --git a/build-package b/build-package
index 31c8e0a6..208149b5 100755
--- a/build-package
+++ b/build-package
@@ -71,10 +71,6 @@ for opt in ${@}; do
mk_pkg_uninstaller
;;
- setupwizard )
- mk_pkg_setupwizard
- ;;
-
bromitewebview )
check_nanodroid || error "run 'build-package pull' first!"
mk_pkg_bromite_webview
@@ -101,7 +97,6 @@ for opt in ${@}; do
mk_pkg_fdroid
mk_pkg_patcher
mk_pkg_uninstaller
- mk_pkg_setupwizard
mk_pkg_bromite_webview
mk_pkg_osmand
mk_pkg_systest
diff --git a/data/build-package.common b/data/build-package.common
index becdf841..3cae36e2 100644
--- a/data/build-package.common
+++ b/data/build-package.common
@@ -156,7 +156,6 @@ increase_version_number () {
for file in "CommonAddon" "CommonInstaller" \
"systest/SysTest" "patcher/CommonPatcher" \
- "SetupWizard/nanodroid-setup" \
"uninstaller/META-INF/com/google/android/update-binary"; do
sed -e "s/^VERSION=.*/VERSION=${1}.${date}/" -i "${CWD}/${file}"
done
@@ -168,11 +167,6 @@ increase_version_number () {
sed -e "s/version=.*/version=v${1}.${date}/" -i \
"${CWD}/${module}/module.prop"
done
-
- sed -e "s/rom_version\",.*/rom_version\", \"${1}\")\;/" -i \
- "${CWD}/SetupWizard/META-INF/com/google/android/aroma-config"
- sed -e "s/rom_date\",.*/rom_date\", \"${date}\")\;/" -i \
- "${CWD}/SetupWizard/META-INF/com/google/android/aroma-config"
}
increase_module_version () {
@@ -223,7 +217,6 @@ create zip files:
fdroid | create FDroid package zip from repo
patcher | create framework patcher zip from repo
uninstaller | create uninstaller zip from repo
- setupwizard | create SetupWizard zip from repo
bromitewebview | create Bromite WebView zip from repo
osmand | create OsmAnd package zip from repo
google | create Google package zip from repo
diff --git a/data/build-package.pkg b/data/build-package.pkg
index 3eb48505..c1c7e989 100644
--- a/data/build-package.pkg
+++ b/data/build-package.pkg
@@ -95,21 +95,6 @@ mk_pkg_patcher () {
progress $!
}
-create_setupwizard_package() {
- ZIP="NanoDroid-setupwizard-${VERSION}.zip"
-
- print_package "Setup Wizard"
-
- zip_add SetupWizard
-
- sum_sign_package "${ZIP}"
-}
-
-mk_pkg_setupwizard () {
- create_setupwizard_package &
- progress $!
-}
-
create_uninstaller_package() {
ZIP="NanoDroid-uninstaller-${VERSION}.zip"
diff --git a/data/build-package.report b/data/build-package.report
index 8d675c36..6e394c2c 100644
--- a/data/build-package.report
+++ b/data/build-package.report
@@ -255,10 +255,6 @@ get_msc_info () {
*patcher*update* ) local msc_type="NanoDroid Framework Patcher TWRP invoker" ;;
*patcher*.prop* ) local msc_type="NanoDroid Framework Patcher Module Module properties" ;;
- *SetupWizard*update*) local msc_type="NanoDroid SetupWizard AROMA invoker" ;;
- *SetupWizard*aroma*) local msc_type="NanoDroid SetupWizard AROMA configuration" ;;
- *SetupWizard/nano*) local msc_type="NanoDroid SetupWizard Worker" ;;
-
*SysTest* ) local msc_type="NanoDroid System Tester" ;;
*systest*update* ) local msc_type="NanoDroid System Tester TWRP invoker" ;;
@@ -326,7 +322,6 @@ get_dst_info () {
*BromiteWebView*.zip* ) local dst_pkg="NanoDroid BromiteWebView" ;;
*OsmAnd*.zip* ) local dst_pkg="NanoDroid OsmAnd" ;;
*patcher*.zip* ) local dst_pkg="NanoDroid Framework Patcher" ;;
- *setupwizard*.zip* ) local dst_pkg="NanoDroid SetupWizard" ;;
*systest*.zip* ) local dst_pkg="NanoDroid System Tester" ;;
*uninstaller*.zip* ) local dst_pkg="NanoDroid Uninstaller" ;;
*Google*.zip* ) local dst_pkg="NanoDroid Google" ;;
diff --git a/doc/AlterInstallation.md b/doc/AlterInstallation.md
index 68c5ec9a..9af2d186 100644
--- a/doc/AlterInstallation.md
+++ b/doc/AlterInstallation.md
@@ -73,7 +73,7 @@ nanodroid_forcesystem=0
where `1` means `on` and `0` means `off`. If no `.nanodroid-setup` is found, the [default settings](.nanodroid-setup) will be used (equals to the example above), if your `.nanodroid-setup` file exists, but is missing entries, those entries will be added, using the default values.
-Alternatively you can also use the NanoDroid-SetupWizard package instead of manual creation of the configuration file.
+See the [default settings](.nanodroid-setup).
## Detailed Description
diff --git a/doc/Applications.md b/doc/Applications.md
index 81b9c2f2..403ec182 100644
--- a/doc/Applications.md
+++ b/doc/Applications.md
@@ -49,8 +49,6 @@ on your device, in one of the following directories
All applications listed in that file will be installed. See the [default settings](.nanodroid-apps), which are used when no `.nanodroid-apps` configuration file was found.
-Alternatively you can also use the Setup Wizard instead of manual creation of the configuration file (if you've got an arm/arm64 device).
-
The syntax is pretty simple:
* one app per line
diff --git a/doc/NanoDroidOverlay.md b/doc/NanoDroidOverlay.md
index bc86bb99..c0f1716b 100644
--- a/doc/NanoDroidOverlay.md
+++ b/doc/NanoDroidOverlay.md
@@ -55,8 +55,6 @@ on your device, in one of the following directories
See the [default settings](.nanodroid-overlay).
-Alternatively you can also use the NanoDroid Setup Wizard package instead of manual creation of the configuration file.
-
The syntax is pretty simple:
* one app per line