new setting: nanodroid_override

ChangeLog.md

@@ -10,6 +10,13 @@
   * value `1` for `nanodroid_play` will now check if Fake Store is installed and will get rid of it in favour of Play Store
 * CommonInstaller, SetupWizard
   * new value `4` for `nanodroid_play`, will install Yalp Store and Play Store
+  * new setting `nanodroid_override`, whether to override an existing app
+     * `0` means that a ROM app is preferred against a NanoDroid app, where `1` means the NanoDroid apps is prefered.
+
+### Updates
+
+* manual
+  * Play Store (11.3.15)
 
 ## 17.8.20180811
 

CommonInstaller

@@ -747,11 +747,31 @@ install_apps () {
 
 		for app in ${INSTALL_APPS}; do
 			if [[ ${app} = Adaway && -d /system/app/AdAway ]]; then
+				if [ "${nanodroid_override}" -eq 0 ]; then
 					ui_print " <<> app: Adaway already provided by ROM (as AdAway)"
+				else	nanodroid_install_apk Adaway
+					echo "   + removing conflicting AdAway"
+					if [ "${ROM_NO_XBIN}" -eq 1 ]; then
+						${MODPATH}/system/bin/nanodroid-overlay --add AdAway
+					else	${MODPATH}/system/xbin/nanodroid-overlay --add AdAway
+					fi
+				fi
 			elif [[ ${app} = OmniClock && -d /system/app/OmniClockOSS ]]; then
+				if [ "${nanodroid_override}" -eq 0 ]; then
 					ui_print " <<> app: OmniClock already provided by ROM (as OmniClockOSS)"
+				else
+					nanodroid_install_apk OmniClock
+					echo "   + removing conflicting OmniClockOSS"
+					if [ "${ROM_NO_XBIN}" -eq 1 ]; then
+						${MODPATH}/system/bin/nanodroid-overlay --add OmniClockOSS
+					else	${MODPATH}/system/xbin/nanodroid-overlay --add OmniClockOSS
+					fi
+				fi
 			elif [[ -d /system/app/${app} && ! -d ${RESTORE_PATH}/system/app/${app} ]]; then
+				if [ "${nanodroid_override}" -eq 0 ]; then
 					ui_print " <<> app: ${app} already provided by ROM"
+				else	nanodroid_install_apk ${app}
+				fi
 			elif [[ -d "${INSTALLER}/system/app/${app}" ]]; then
 				nanodroid_install_apk ${app}
 			else	ui_print " <<>> app: ${app} missing"
@@ -1263,6 +1283,7 @@ check_cfg_setup () {
 	[ -z ${nanodroid_nano} ] && set_prop nanodroid_nano 1
 	[ -z ${nanodroid_utils} ] && set_prop nanodroid_utils 1
 	[ -z ${nanodroid_fonts} ] && set_prop nanodroid_fonts 1
+	[ -z ${nanodroid_override} ] && set_prop nanodroid_override 0
 
 	source ${cfg_setup}
 }

doc/.nanodroid-setup

@@ -14,3 +14,4 @@ nanodroid_nano=1
 nanodroid_bash=1
 nanodroid_utils=1
 nanodroid_fonts=1
+nanodroid_override=0

doc/AlterInstallation.md

@@ -32,6 +32,7 @@ nanodroid_bash=1
 nanodroid_nano=1
 nanodroid_utils=1
 nanodroid_fonts=1
+nanodroid_override=0
 ```
 
 the **microG** package supports the following options
@@ -70,7 +71,13 @@ whether to provide **F-Droid**
 
 whether to provide included applications [> Details](doc/Applications.md)
 
-`nanodroid_play=[0|1|2]`
+`nanodroid_override=[0|1]`
+
+whether to override an already existing app.
+
+`0` means that a ROM app is preferred against a NanoDroid app, where `1` means the NanoDroid apps is prefered.
+
+`nanodroid_play=[0|1|2|3|4]`
 
 what app store to use:
 * `0` will not provide any app store

setup-wizard/META-INF/com/google/android/aroma-config

@@ -73,7 +73,8 @@ checkbox(
 	"GNU Bash",	"Install GNU Bash Shell",				1,
 	"GNU Nano",	"Install GNU Nano Terminal Editor",			1,
 	"Shell Utils",	"Install Shell Utils from bsdmainutils and util-linux",	1,
-	"Nintendo Fonts", "Install Nintendo Fonts",				1
+	"Nintendo Fonts", "Install Nintendo Fonts",				1,
+	"Override",	"Override ROM apps that are included in NanoDroid",	0
 );
 
 selectbox(

setup-wizard/nanodroid-setup

@@ -96,6 +96,7 @@ setup_add 11 nanodroid_bash
 setup_add 12 nanodroid_nano
 setup_add 13 nanodroid_utils
 setup_add 14 nanodroid_fonts
+setup_add 15 nanodroid_override
 
 if grep -q "selected.1=1" "${store_prop}"; then
 	ui_print "  <>> setting property: nanodroid_play [None]"