diff --git a/F-Droid/ChangeLog.md b/FDroid/ChangeLog.md similarity index 100% rename from F-Droid/ChangeLog.md rename to FDroid/ChangeLog.md diff --git a/F-Droid/CommonAddon b/FDroid/CommonAddon similarity index 100% rename from F-Droid/CommonAddon rename to FDroid/CommonAddon diff --git a/F-Droid/CommonInstaller b/FDroid/CommonInstaller similarity index 100% rename from F-Droid/CommonInstaller rename to FDroid/CommonInstaller diff --git a/F-Droid/META-INF/com/google/android/update-binary b/FDroid/META-INF/com/google/android/update-binary similarity index 100% rename from F-Droid/META-INF/com/google/android/update-binary rename to FDroid/META-INF/com/google/android/update-binary diff --git a/F-Droid/META-INF/com/google/android/updater-script b/FDroid/META-INF/com/google/android/updater-script similarity index 100% rename from F-Droid/META-INF/com/google/android/updater-script rename to FDroid/META-INF/com/google/android/updater-script diff --git a/F-Droid/README.md b/FDroid/README.md similarity index 100% rename from F-Droid/README.md rename to FDroid/README.md diff --git a/F-Droid/aapt.arm b/FDroid/aapt.arm similarity index 100% rename from F-Droid/aapt.arm rename to FDroid/aapt.arm diff --git a/F-Droid/aapt.x86 b/FDroid/aapt.x86 similarity index 100% rename from F-Droid/aapt.x86 rename to FDroid/aapt.x86 diff --git a/F-Droid/busybox.arm b/FDroid/busybox.arm similarity index 100% rename from F-Droid/busybox.arm rename to FDroid/busybox.arm diff --git a/F-Droid/busybox.x86 b/FDroid/busybox.x86 similarity index 100% rename from F-Droid/busybox.x86 rename to FDroid/busybox.x86 diff --git a/F-Droid/module.prop b/FDroid/module.prop similarity index 100% rename from F-Droid/module.prop rename to FDroid/module.prop diff --git a/F-Droid/service.sh b/FDroid/service.sh similarity index 100% rename from F-Droid/service.sh rename to FDroid/service.sh diff --git a/F-Droid/system/app/FDroid b/FDroid/system/app/FDroid similarity index 100% rename from F-Droid/system/app/FDroid rename to FDroid/system/app/FDroid diff --git a/F-Droid/system/etc/org.fdroid.fdroid b/FDroid/system/etc/org.fdroid.fdroid similarity index 100% rename from F-Droid/system/etc/org.fdroid.fdroid rename to FDroid/system/etc/org.fdroid.fdroid diff --git a/F-Droid/system/priv-app/FDroidPrivileged b/FDroid/system/priv-app/FDroidPrivileged similarity index 100% rename from F-Droid/system/priv-app/FDroidPrivileged rename to FDroid/system/priv-app/FDroidPrivileged diff --git a/F-Droid/unzip.arm b/FDroid/unzip.arm similarity index 100% rename from F-Droid/unzip.arm rename to FDroid/unzip.arm diff --git a/F-Droid/unzip.x86 b/FDroid/unzip.x86 similarity index 100% rename from F-Droid/unzip.x86 rename to FDroid/unzip.x86 diff --git a/setup-wizard/ChangeLog.md b/SetupWizard/ChangeLog.md similarity index 100% rename from setup-wizard/ChangeLog.md rename to SetupWizard/ChangeLog.md diff --git a/setup-wizard/META-INF/com/google/android/aroma-config b/SetupWizard/META-INF/com/google/android/aroma-config similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma-config rename to SetupWizard/META-INF/com/google/android/aroma-config diff --git a/setup-wizard/META-INF/com/google/android/aroma/changelog.txt b/SetupWizard/META-INF/com/google/android/aroma/changelog.txt similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/changelog.txt rename to SetupWizard/META-INF/com/google/android/aroma/changelog.txt diff --git a/setup-wizard/META-INF/com/google/android/aroma/icons/agreement.png b/SetupWizard/META-INF/com/google/android/aroma/icons/agreement.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/icons/agreement.png rename to SetupWizard/META-INF/com/google/android/aroma/icons/agreement.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/icons/alert.png b/SetupWizard/META-INF/com/google/android/aroma/icons/alert.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/icons/alert.png rename to SetupWizard/META-INF/com/google/android/aroma/icons/alert.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/icons/alliance.png b/SetupWizard/META-INF/com/google/android/aroma/icons/alliance.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/icons/alliance.png rename to SetupWizard/META-INF/com/google/android/aroma/icons/alliance.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/icons/apps.png b/SetupWizard/META-INF/com/google/android/aroma/icons/apps.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/icons/apps.png rename to SetupWizard/META-INF/com/google/android/aroma/icons/apps.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/icons/back.png b/SetupWizard/META-INF/com/google/android/aroma/icons/back.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/icons/back.png rename to SetupWizard/META-INF/com/google/android/aroma/icons/back.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/icons/confirm.png b/SetupWizard/META-INF/com/google/android/aroma/icons/confirm.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/icons/confirm.png rename to SetupWizard/META-INF/com/google/android/aroma/icons/confirm.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/icons/customize.png b/SetupWizard/META-INF/com/google/android/aroma/icons/customize.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/icons/customize.png rename to SetupWizard/META-INF/com/google/android/aroma/icons/customize.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/icons/default.png b/SetupWizard/META-INF/com/google/android/aroma/icons/default.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/icons/default.png rename to SetupWizard/META-INF/com/google/android/aroma/icons/default.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/icons/finish.png b/SetupWizard/META-INF/com/google/android/aroma/icons/finish.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/icons/finish.png rename to SetupWizard/META-INF/com/google/android/aroma/icons/finish.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/icons/info.png b/SetupWizard/META-INF/com/google/android/aroma/icons/info.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/icons/info.png rename to SetupWizard/META-INF/com/google/android/aroma/icons/info.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/icons/install.png b/SetupWizard/META-INF/com/google/android/aroma/icons/install.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/icons/install.png rename to SetupWizard/META-INF/com/google/android/aroma/icons/install.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/icons/installbutton.png b/SetupWizard/META-INF/com/google/android/aroma/icons/installbutton.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/icons/installbutton.png rename to SetupWizard/META-INF/com/google/android/aroma/icons/installbutton.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/icons/license.png b/SetupWizard/META-INF/com/google/android/aroma/icons/license.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/icons/license.png rename to SetupWizard/META-INF/com/google/android/aroma/icons/license.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/icons/menu.png b/SetupWizard/META-INF/com/google/android/aroma/icons/menu.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/icons/menu.png rename to SetupWizard/META-INF/com/google/android/aroma/icons/menu.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/icons/next.png b/SetupWizard/META-INF/com/google/android/aroma/icons/next.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/icons/next.png rename to SetupWizard/META-INF/com/google/android/aroma/icons/next.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/icons/personalize.png b/SetupWizard/META-INF/com/google/android/aroma/icons/personalize.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/icons/personalize.png rename to SetupWizard/META-INF/com/google/android/aroma/icons/personalize.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/icons/update.png b/SetupWizard/META-INF/com/google/android/aroma/icons/update.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/icons/update.png rename to SetupWizard/META-INF/com/google/android/aroma/icons/update.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/icons/welcome.png b/SetupWizard/META-INF/com/google/android/aroma/icons/welcome.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/icons/welcome.png rename to SetupWizard/META-INF/com/google/android/aroma/icons/welcome.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/license.txt b/SetupWizard/META-INF/com/google/android/aroma/license.txt similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/license.txt rename to SetupWizard/META-INF/com/google/android/aroma/license.txt diff --git a/setup-wizard/META-INF/com/google/android/aroma/nanolx.png b/SetupWizard/META-INF/com/google/android/aroma/nanolx.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/nanolx.png rename to SetupWizard/META-INF/com/google/android/aroma/nanolx.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/bg.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/bg.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/bg.png rename to SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/bg.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/button.9.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/button.9.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/button.9.png rename to SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/button.9.png diff --git a/setup-wizard/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 similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/button_focus.9.png rename to SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/button_focus.9.png diff --git a/setup-wizard/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 similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/button_press.9.png rename to SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/button_press.9.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/cb.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/cb.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/cb.png rename to SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/cb.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/cb_focus.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/cb_focus.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/cb_focus.png rename to SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/cb_focus.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/cb_on.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/cb_on.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/cb_on.png rename to SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/cb_on.png diff --git a/setup-wizard/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 similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/cb_on_focus.png rename to SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/cb_on_focus.png diff --git a/setup-wizard/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 similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/cb_on_press.png rename to SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/cb_on_press.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/cb_press.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/cb_press.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/cb_press.png rename to SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/cb_press.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/dialog.9.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/dialog.9.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/dialog.9.png rename to SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/dialog.9.png diff --git a/setup-wizard/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 similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/dialog_titlebar.9.png rename to SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/dialog_titlebar.9.png diff --git a/setup-wizard/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 similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/font.roboto.big.png rename to SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/font.roboto.big.png diff --git a/setup-wizard/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 similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/font.roboto.small.png rename to SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/font.roboto.small.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.agreement.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.agreement.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.agreement.png rename to SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.agreement.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.alert.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.alert.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.alert.png rename to SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.alert.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.apps.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.apps.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.apps.png rename to SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.apps.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.back.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.back.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.back.png rename to SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.back.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.confirm.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.confirm.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.confirm.png rename to SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.confirm.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.customize.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.customize.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.customize.png rename to SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.customize.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.default.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.default.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.default.png rename to SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.default.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.exit.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.exit.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.exit.png rename to SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.exit.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.info.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.info.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.info.png rename to SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.info.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.install.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.install.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.install.png rename to SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.install.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.installbutton.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.installbutton.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.installbutton.png rename to SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.installbutton.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.license.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.license.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.license.png rename to SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.license.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.menu.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.menu.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.menu.png rename to SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.menu.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.modem.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.modem.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.modem.png rename to SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.modem.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.next.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.next.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.next.png rename to SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.next.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.personalize.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.personalize.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.personalize.png rename to SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.personalize.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.reboot.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.reboot.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.reboot.png rename to SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.reboot.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.recovery.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.recovery.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.recovery.png rename to SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.recovery.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.update.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.update.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.update.png rename to SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.update.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.welcome.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.welcome.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.welcome.png rename to SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/icon.welcome.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/list.9.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/list.9.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/list.9.png rename to SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/list.9.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/navbar.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/navbar.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/navbar.png rename to SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/navbar.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/radio.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/radio.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/radio.png rename to SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/radio.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/radio_focus.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/radio_focus.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/radio_focus.png rename to SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/radio_focus.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/radio_on.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/radio_on.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/radio_on.png rename to SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/radio_on.png diff --git a/setup-wizard/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 similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/radio_on_focus.png rename to SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/radio_on_focus.png diff --git a/setup-wizard/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 similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/radio_on_press.png rename to SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/radio_on_press.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/radio_press.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/radio_press.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/radio_press.png rename to SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/radio_press.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/theme.prop b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/theme.prop similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/theme.prop rename to SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/theme.prop diff --git a/setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/titlebar.9.png b/SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/titlebar.9.png similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/themes/touchwiz/titlebar.9.png rename to SetupWizard/META-INF/com/google/android/aroma/themes/touchwiz/titlebar.9.png diff --git a/setup-wizard/META-INF/com/google/android/aroma/ttf/Roboto-Regular.ttf b/SetupWizard/META-INF/com/google/android/aroma/ttf/Roboto-Regular.ttf similarity index 100% rename from setup-wizard/META-INF/com/google/android/aroma/ttf/Roboto-Regular.ttf rename to SetupWizard/META-INF/com/google/android/aroma/ttf/Roboto-Regular.ttf diff --git a/setup-wizard/META-INF/com/google/android/update-binary b/SetupWizard/META-INF/com/google/android/update-binary similarity index 100% rename from setup-wizard/META-INF/com/google/android/update-binary rename to SetupWizard/META-INF/com/google/android/update-binary diff --git a/setup-wizard/META-INF/com/google/android/update-binary-installer b/SetupWizard/META-INF/com/google/android/update-binary-installer similarity index 100% rename from setup-wizard/META-INF/com/google/android/update-binary-installer rename to SetupWizard/META-INF/com/google/android/update-binary-installer diff --git a/setup-wizard/META-INF/com/google/android/updater-script b/SetupWizard/META-INF/com/google/android/updater-script similarity index 100% rename from setup-wizard/META-INF/com/google/android/updater-script rename to SetupWizard/META-INF/com/google/android/updater-script diff --git a/setup-wizard/README.md b/SetupWizard/README.md similarity index 100% rename from setup-wizard/README.md rename to SetupWizard/README.md diff --git a/setup-wizard/nanodroid-setup b/SetupWizard/nanodroid-setup similarity index 100% rename from setup-wizard/nanodroid-setup rename to SetupWizard/nanodroid-setup diff --git a/data/build-package.common b/data/build-package.common index f803a01..77f6ad7 100644 --- a/data/build-package.common +++ b/data/build-package.common @@ -112,26 +112,26 @@ increase_version_number () { for file in "build-package" "CommonInstaller" \ "systest/SysTest" "patcher/CommonPatcher" \ - "setup-wizard/nanodroid-setup" "CommonAddon" \ + "SetupWizard/nanodroid-setup" "CommonAddon" \ "uninstaller/META-INF/com/google/android/update-binary"; do sed -e "s/^VERSION=.*/VERSION=${2}.${ver}/" -i "${CWD}/${file}" done - for module in Full microG F-Droid BromiteWebView OsmAnd; do + for module in Full microG FDroid BromiteWebView OsmAnd; do sed -e "s/version=.*/version=v${2}.${ver}/" -i \ "${CWD}/${module}/module.prop" done sed -e "s/rom_version\",.*/rom_version\", \"${2}\")\;/" -i \ - "${CWD}/setup-wizard/META-INF/com/google/android/aroma-config" + "${CWD}/SetupWizard/META-INF/com/google/android/aroma-config" sed -e "s/rom_date\",.*/rom_date\", \"${ver}\")\;/" -i \ - "${CWD}/setup-wizard/META-INF/com/google/android/aroma-config" + "${CWD}/SetupWizard/META-INF/com/google/android/aroma-config" exit 0 } increase_module_version () { - for module in Full microG F-Droid BromiteWebView OsmAnd; do + for module in Full microG FDroid BromiteWebView OsmAnd; do eval $(grep versionCode "${PWD}"/"${module}"/module.prop) versionCode=$((versionCode+1)) sed -e "s/versionCode.*/versionCode=${versionCode}/" \ @@ -169,12 +169,12 @@ update contents: u-gsync | update Google Sync Adapters create zip files: - full | create full package zip from repo + full | create Full package zip from repo microg | create microG package zip from repo - fdroid | create F-Droid package zip from repo + fdroid | create FDroid package zip from repo patcher | create framework patcher zip from repo uninstaller | create uninstaller zip from repo - setupwizard | create setup-wizard zip from repo + setupwizard | create SetupWizard zip from repo bromitewebview | create Bromite WebView zip from repo osmand | create OsmAnd package zip from repo all | create all zips from repo diff --git a/data/build-package.pkg b/data/build-package.pkg index bdd3afe..2701ac5 100644 --- a/data/build-package.pkg +++ b/data/build-package.pkg @@ -36,9 +36,9 @@ mk_pkg_microg () { create_fdroid_package() { ZIP="NanoDroid-fdroid-${VERSION}".zip - print_package "F-Droid" + print_package "FDroid" - zip_add F-Droid + zip_add FDroid zip_add_config .nanodroid-setup 0 sum_sign_package @@ -101,7 +101,7 @@ create_setupwizard_package() { print_package "Setup Wizard" - zip_add setup-wizard + zip_add SetupWizard sum_sign_package }