Many fixes

app/src/main/res/layout/activity_settings.xml

@@ -9,46 +9,41 @@
         android:title="@string/generalSettings">
         
         <CheckBoxPreference
-	     android:key="startServiceAtSystemBoot"
-	     android:summary="@string/onOff"
-	     android:title="@string/startAtSystemBoot" />
+			 android:key="startServiceAtSystemBoot"
+			 android:summary="@string/onOff"
+			 android:title="@string/startAtSystemBoot" />
         
         <CheckBoxPreference
-	     android:key="startServiceAfterAppUpdate"
-	     android:summary="@string/startServiceAfterAppUpdate"
-	     android:title="@string/startServiceAfterAppUpdateShort" />
-        <!--
+			 android:key="startServiceAfterAppUpdate"
+			 android:summary="@string/startServiceAfterAppUpdate"
+			 android:title="@string/startServiceAfterAppUpdateShort" />
+
         <CheckBoxPreference
-	     android:key="startNewThreadForRuleActivation"
-	     android:summary="@string/startNewThreadForRuleExecution"
-	     android:title="@string/newThreadRules" />
-        -->
-        <CheckBoxPreference
-	     android:key="showIconWhenServiceIsRunning"
-	     android:summary="@string/showIconWhenServiceIsRunning"
-	     android:title="@string/showIcon" />
+			 android:key="showIconWhenServiceIsRunning"
+			 android:summary="@string/showIconWhenServiceIsRunning"
+			 android:title="@string/showIcon" />
 
 		<CheckBoxPreference
-			android:key="logToConsole"
-			android:summary="@string/onOff"
-			android:title="@string/logToConsole" />
+				android:key="logToConsole"
+				android:summary="@string/onOff"
+				android:title="@string/logToConsole" />
 
         <CheckBoxPreference
-	     android:key="writeLogFile"
-	     android:summary="@string/onOff"
-	     android:title="@string/writeLogFile" />
+			 android:key="writeLogFile"
+			 android:summary="@string/onOff"
+			 android:title="@string/writeLogFile" />
         
         <EditTextPreference
             android:key="logLevel"
             android:summary="@string/logLevelSummary"
             android:title="@string/logLevelTitle"
-            android:inputType="number"></EditTextPreference>
+            android:inputType="number" />
 
 		<EditTextPreference
 			android:key="logFileMaxSize"
 			android:summary="@string/logFileMaxSizeSummary"
 			android:title="@string/logFileMaxSizeTitle"
-			android:inputType="number"></EditTextPreference>
+			android:inputType="number" />
 
 		<ListPreference
 			android:key="startScreen"
@@ -119,21 +114,11 @@
         
     </PreferenceCategory>
 
-
     <PreferenceCategory
         android:summary="@string/positioningSettings"
         android:title="@string/positioningSettings">
 
-		<!--			android:id="@id/lstPositioningEngine"-->
-<!--
-		<ListPreference
-			android:title="@string/positioningEngine"
-			android:key="positioningEngine"
-			android:defaultValue="0"
-			android:entries="@array/positioningEngineOptions"
-			android:entryValues="@array/positioningEngineOptionsValues" />
--->
-        <CheckBoxPreference
+		<CheckBoxPreference
 	     android:key="useWifiForPositioning"
 	     android:summary="@string/listenToWifiState"
 	     android:title="@string/wifiState" />
@@ -147,19 +132,19 @@
             android:key="useAccelerometerAfterIdleTime"
             android:summary="@string/accelerometerTimer"
             android:title="@string/cellMastIdleTime"
-            android:inputType="number"></EditTextPreference>
+            android:inputType="number" />
         
         <EditTextPreference
             android:key="accelerometerMovementThreshold"
             android:summary="@string/accelerometerThresholdDescription"
             android:title="@string/accelerometerThreshold"
-            android:inputType="number"></EditTextPreference>
+            android:inputType="number" />
         
         <EditTextPreference
             android:key="speedMaximumTimeBetweenLocations"
             android:summary="@string/speedMaximumTimeBetweenLocations"
             android:title="@string/speedMaximumTime"
-            android:inputType="number"></EditTextPreference>   
+            android:inputType="number" />
         
         <CheckBoxPreference
 	     android:key="rememberLastActivePoi"
@@ -181,37 +166,31 @@
             android:key="MINIMUM_DISTANCE_CHANGE_FOR_GPS_UPDATE"
             android:summary="@string/minimumDistanceChangeForGpsLocationUpdates"
             android:title="@string/distanceForGpsUpdate"
-            android:inputType="number"></EditTextPreference>
+            android:inputType="number" />
                     
         <EditTextPreference
             android:key="MINIMUM_DISTANCE_CHANGE_FOR_NETWORK_UPDATE"
             android:summary="@string/minimumDistanceChangeForNetworkLocationUpdates"
             android:title="@string/distanceForNetworkUpdate"
-            android:inputType="number"></EditTextPreference>
-<!--    We won't need this setting anymore, at least it won't be available for the user.             
-   		<EditTextPreference
-            android:key="SATISFACTORY_ACCURACY_GPS"
-            android:summary="@string/satisfactoryAccuracyGps"
-            android:title="@string/gpsAccuracy"
-            android:inputType="number"></EditTextPreference>
- -->            
+            android:inputType="number" />
+
        	<EditTextPreference
             android:key="SATISFACTORY_ACCURACY_NETWORK"
             android:summary="@string/satisfactoryAccuracyNetwork"
             android:title="@string/networkAccuracy"
-            android:inputType="number"></EditTextPreference>
+            android:inputType="number" />
         
         <EditTextPreference
 	        android:key="MINIMUM_TIME_BETWEEN_UPDATE"
 	        android:summary="@string/minimumTimeForLocationUpdates"
 	        android:title="@string/timeForUpdate"
-	        android:inputType="number"></EditTextPreference>
+	        android:inputType="number" />
         
         <EditTextPreference
 	        android:key="gpsTimeout"
 	        android:summary="@string/timeoutForGpsComparisonsSummary"
 	        android:title="@string/timeoutForGpsComparisonsTitle"
-	        android:inputType="number"></EditTextPreference>
+	        android:inputType="number"/>
         
     </PreferenceCategory>
                          
@@ -223,19 +202,19 @@
 	        android:key="timeBetweenNoiseLevelMeasurements"
 	        android:summary="@string/timeBetweenNoiseLevelMeasurementsSummary"
 	        android:title="@string/timeBetweenNoiseLevelMeasurementsTitle"
-	        android:inputType="number"></EditTextPreference>
+	        android:inputType="number" />
 
         <EditTextPreference
 	        android:key="lengthOfNoiseLevelMeasurements"
 	        android:summary="@string/lengthOfNoiseLevelMeasurementsSummary"
 	        android:title="@string/lengthOfNoiseLevelMeasurementsTitle"
-	        android:inputType="number"></EditTextPreference>
+	        android:inputType="number" />
 
         <EditTextPreference
 	        android:key="referenceValueForNoiseLevelMeasurements"
 	        android:summary="@string/referenceValueForNoiseLevelMeasurementsSummary"
 	        android:title="@string/referenceValueForNoiseLevelMeasurementsTitle"
-	        android:inputType="number"></EditTextPreference>
+	        android:inputType="number" />
         
     </PreferenceCategory>
                          
@@ -252,19 +231,19 @@
 	        android:key="httpAttempts"
 	        android:summary="@string/httpAttemptsSummary"
 	        android:title="@string/httpAttemptsTitle"
-	        android:inputType="number"></EditTextPreference>
+	        android:inputType="number" />
 
         <EditTextPreference
 	        android:key="httpAttemptsTimeout"
 	        android:summary="@string/httpAttemptsTimeoutSummary"
 	        android:title="@string/httpAttemptsTimeoutTitle"
-	        android:inputType="number"></EditTextPreference>
+	        android:inputType="number" />
 
         <EditTextPreference
 	        android:key="httpAttemptGap"
 	        android:summary="@string/httpAttemptGapSummary"
 	        android:title="@string/httpAttemptGapTitle"
-	        android:inputType="number"></EditTextPreference>
+	        android:inputType="number" />
         
     </PreferenceCategory>
                          
@@ -276,7 +255,7 @@
 	        android:key="timeBetweenProcessMonitorings"
 	        android:summary="@string/timeBetweenProcessMonitoringsSummary"
 	        android:title="@string/timeBetweenProcessMonitoringsTitle"
-	        android:inputType="number"></EditTextPreference>
+	        android:inputType="number" />
         
     </PreferenceCategory>
 
@@ -288,7 +267,7 @@
 			android:key="acceptDevicePositionSignalEveryX_MilliSeconds"
 			android:summary="@string/deviceOrientationTimeAcceptIntervalSummary"
 			android:title="@string/deviceOrientationTimeAcceptIntervalTitle"
-			android:inputType="number"></EditTextPreference>
+			android:inputType="number" />
 
 	</PreferenceCategory>
                          
@@ -300,13 +279,13 @@
 	        android:key="activityDetectionFrequency"
 	        android:summary="@string/activityDetectionFrequencySummary"
 	        android:title="@string/activityDetectionFrequencyTitle"
-	        android:inputType="number"></EditTextPreference>
+	        android:inputType="number" />
         
         <EditTextPreference
 	        android:key="activityDetectionRequiredProbability"
 	        android:summary="@string/activityDetectionRequiredProbabilitySummary"
 	        android:title="@string/activityDetectionRequiredProbabilityTitle"
-	        android:inputType="number"></EditTextPreference>
+	        android:inputType="number" />
         
     </PreferenceCategory>
 
@@ -318,9 +297,8 @@
 			android:key="musicCheckFrequency"
 			android:summary="@string/musicCheckFrequencySummary"
 			android:title="@string/musicCheckFrequencyTitle"
-			android:inputType="number"></EditTextPreference>
+			android:inputType="number" />
 
 	</PreferenceCategory>
     
-    
 </PreferenceScreen>