Rework location provider system

res/values-es/strings.xml

@@ -23,11 +23,8 @@
     <string-array name="settings_provider_names">
         <item>Proveedor GPS</item>
         <item>Proveedor de red</item>
-    </string-array>
-    <string-array name="settings_provider_values">
-        <item>gps</item>
-        <item>red</item>
-    </string-array>
+        <item>Proveedor mixto</item>
+	</string-array>
 
     <string name="menu_status">Estado</string>
     <string name="menu_about">Acerca de&#8230;</string>
@@ -44,7 +41,6 @@
     <string name="status_connection_fail">Fallo en la conexión</string>
     <string name="status_send_fail">Erro en el envío</string>
     <string name="status_location_update">Posición actualizada</string>
-    <string name="status_location_status">Estado proveedor cambiado</string>
     <string name="status_preference_update">Preferencias actualizadas</string>
 
 </resources>	 

res/values-ru/strings.xml

@@ -23,10 +23,7 @@
     <string-array name="settings_provider_names">
         <item>GPS провайдер</item>
         <item>Сетевой провайдер</item>
-    </string-array>
-    <string-array name="settings_provider_values">
-        <item>gps</item>
-        <item>network</item>
+        <item>Смешанный провайдер</item>
     </string-array>
 
     <string name="menu_status">Состояние</string>
@@ -44,7 +41,6 @@
     <string name="status_connection_fail">Ошибка установки соединения</string>
     <string name="status_send_fail">Ошибка отправки</string>
     <string name="status_location_update">Обновление местоположения</string>
-    <string name="status_location_status">Изменилось состояние провайдера</string>
     <string name="status_preference_update">Обновление настроек</string>
 
 </resources>

res/values/strings.xml

@@ -23,12 +23,9 @@
     <string-array name="settings_provider_names">
         <item>GPS provider</item>
         <item>Network provider</item>
+        <item>Mixed provider</item>
     </string-array>
-    <string-array name="settings_provider_values">
-        <item>gps</item>
-        <item>network</item>
-    </string-array>
-
+    
     <string name="menu_status">Status</string>
     <string name="menu_about">About</string>
     <string name="menu_clear">Clear</string>
@@ -44,7 +41,6 @@
     <string name="status_connection_fail">Connection failed</string>
     <string name="status_send_fail">Send failed</string>
     <string name="status_location_update">Location update</string>
-    <string name="status_location_status">Provider status changed</string>
     <string name="status_preference_update">Preference update</string>
 
 </resources>

res/values/values.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string-array name="settings_provider_values" translatable="false">
+        <item>gps</item>
+        <item>network</item>
+        <item>mixed</item>
+    </string-array>
+
+</resources>

res/xml-v14/preferences.xml

@@ -1,52 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
 
-	<EditTextPreference
+    <EditTextPreference
         android:key="id"
         android:title="@string/settings_id_title" />
-    
-	<EditTextPreference
+
+    <EditTextPreference
+        android:defaultValue="demo.traccar.org"
         android:key="address"
-        android:title="@string/settings_address_title"
         android:summary="@string/settings_address_summary"
-        android:defaultValue="demo.traccar.org" />
+        android:title="@string/settings_address_title" />
 
-	<EditTextPreference
+    <EditTextPreference
+        android:defaultValue="5005"
         android:key="port"
-        android:title="@string/settings_port_title"
+        android:numeric="integer"
         android:summary="@string/settings_port_summary"
-        android:numeric="integer"
-        android:defaultValue="5005" />
-	
-	<EditTextPreference
-        android:key="interval"
-        android:title="@string/settings_interval_title"
-        android:summary="@string/settings_interval_summary"
-        android:numeric="integer"
-        android:defaultValue="60" />
+        android:title="@string/settings_port_title" />
 
-	<ListPreference
-        android:key="provider"
-        android:title="@string/settings_provider_title"
-        android:summary="@string/settings_provider_summary"
+    <EditTextPreference
+        android:defaultValue="60"
+        android:key="interval"
+        android:numeric="integer"
+        android:summary="@string/settings_interval_summary"
+        android:title="@string/settings_interval_title" />
+
+    <ListPreference
+        android:defaultValue="gps"
         android:entries="@array/settings_provider_names"
         android:entryValues="@array/settings_provider_values"
-        android:defaultValue="gps" />
-	
+        android:key="provider"
+        android:summary="@string/settings_provider_summary"
+        android:title="@string/settings_provider_title" />
+
     <CheckBoxPreference
-        android:key="debug"
-        android:title="@string/settings_debug_title"
-        android:summary="@string/settings_debug_summary"
         android:defaultValue="true"
-        android:enabled="false" />
+        android:enabled="false"
+        android:key="debug"
+        android:summary="@string/settings_debug_summary"
+        android:title="@string/settings_debug_title" />
 
     <SwitchPreference
+        android:defaultValue="false"
         android:key="status"
-        android:title="@string/settings_status_title"
         android:summaryOff="@string/settings_status_off_summary"
-		android:summaryOn="@string/settings_status_on_summary"
-		android:switchTextOff="@string/settings_status_off"
-		android:switchTextOn="@string/settings_status_on"
-        android:defaultValue="false" />
+        android:summaryOn="@string/settings_status_on_summary"
+        android:switchTextOff="@string/settings_status_off"
+        android:switchTextOn="@string/settings_status_on"
+        android:title="@string/settings_status_title" />
 
-</PreferenceScreen>
+</PreferenceScreen>

res/xml/preferences.xml

@@ -1,50 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
 
-	<EditTextPreference
+    <EditTextPreference
         android:key="id"
         android:title="@string/settings_id_title" />
-    
-	<EditTextPreference
+
+    <EditTextPreference
+        android:defaultValue="demo.traccar.org"
         android:key="address"
-        android:title="@string/settings_address_title"
         android:summary="@string/settings_address_summary"
-        android:defaultValue="demo.traccar.org" />
+        android:title="@string/settings_address_title" />
 
-	<EditTextPreference
+    <EditTextPreference
+        android:defaultValue="5005"
         android:key="port"
-        android:title="@string/settings_port_title"
+        android:numeric="integer"
         android:summary="@string/settings_port_summary"
-        android:numeric="integer"
-        android:defaultValue="5005" />
-	
-	<EditTextPreference
-        android:key="interval"
-        android:title="@string/settings_interval_title"
-        android:summary="@string/settings_interval_summary"
-        android:numeric="integer"
-        android:defaultValue="60" />
+        android:title="@string/settings_port_title" />
 
-	<ListPreference
-        android:key="provider"
-        android:title="@string/settings_provider_title"
-        android:summary="@string/settings_provider_summary"
+    <EditTextPreference
+        android:defaultValue="60"
+        android:key="interval"
+        android:numeric="integer"
+        android:summary="@string/settings_interval_summary"
+        android:title="@string/settings_interval_title" />
+
+    <ListPreference
+        android:defaultValue="gps"
         android:entries="@array/settings_provider_names"
         android:entryValues="@array/settings_provider_values"
-        android:defaultValue="gps" />
+        android:key="provider"
+        android:summary="@string/settings_provider_summary"
+        android:title="@string/settings_provider_title" />
 
     <CheckBoxPreference
-        android:key="debug"
-        android:title="@string/settings_debug_title"
-        android:summary="@string/settings_debug_summary"
         android:defaultValue="true"
-        android:enabled="false" />
+        android:enabled="false"
+        android:key="debug"
+        android:summary="@string/settings_debug_summary"
+        android:title="@string/settings_debug_title" />
 
     <CheckBoxPreference
+        android:defaultValue="false"
         android:key="status"
-        android:title="@string/settings_status_title"
         android:summaryOff="@string/settings_status_off_summary"
-		android:summaryOn="@string/settings_status_on_summary"
-        android:defaultValue="false" />
+        android:summaryOn="@string/settings_status_on_summary"
+        android:title="@string/settings_status_title" />
 
 </PreferenceScreen>