Refactor periodic tasks.

This commit is contained in:
Sandor Dornbush
2011-04-05 21:34:47 -07:00
parent 9616084769
commit 8d3ab8f93b
24 changed files with 767 additions and 1773 deletions
+7 -5
View File
@@ -112,9 +112,9 @@ limitations under the License.
<item>3.1 miles (senyal GPS pobre)</item>
</string-array>
<!-- Split frequency -->
<string-array name="split_frequency_options">
<item>Sense divisió</item>
<!-- Task frequency -->
<string-array name="task_frequency_options">
<item>Inactiu</item>
<item>100 km</item>
<item>50 km</item>
<item>25 km</item>
@@ -130,8 +130,8 @@ limitations under the License.
<item>1 min</item>
</string-array>
<string-array name="split_frequency_options_ft">
<item>No splitting</item>
<string-array name="task_frequency_options_ft">
<item>Inactiu</item>
<item>100 mi</item>
<item>50 mi</item>
<item>25 mi</item>
@@ -286,6 +286,8 @@ limitations under the License.
<array name="sensor_type_options">
<item>Cap</item>
<item>ANT+ Sensors</item>
<item>SRM ANT+ Bridge</item>
<item>Zephyr Bluetooth</item>
</array>
+4 -5
View File
@@ -48,7 +48,6 @@ limitations under the License.
<item>328 Fuß</item>
</string-array>
<!-- Maximum recording distance -->
<string-array name="max_recording_distance_options">
<item>50 m</item>
@@ -113,9 +112,9 @@ limitations under the License.
<item>3,1 Meilen (sehr schlechtes GPS-Signal)</item>
</string-array>
<!-- Split frequency -->
<string-array name="split_frequency_options">
<item>Nicht zerteilen</item>
<!-- Task frequency -->
<string-array name="task_frequency_options">
<item>Aus</item>
<item>100 km</item>
<item>50 km</item>
<item>25 km</item>
@@ -132,7 +131,7 @@ limitations under the License.
</string-array>
<string-array name="split_frequency_options_ft">
<item>Nicht zerteilen</item>
<item>Aus</item>
<item>100 Meilen</item>
<item>50 Meilen</item>
<item>25 Meilen</item>
+5 -17
View File
@@ -15,18 +15,6 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<resources>
<!-- Task frequency -->
<string-array name="task_frequency_options">
<item>Apagado</item>
<item>1 min</item>
<item>2 min</item>
<item>5 min</item>
<item>10 min</item>
<item>15 min</item>
<item>30 min</item>
<item>60 min</item>
</string-array>
<!-- Minimum recording distance -->
<string-array name="min_recording_distance_options">
<item>1 m</item>
@@ -112,9 +100,9 @@ limitations under the License.
<item>3.1 miles (señal GPS débil)</item>
</string-array>
<!-- Split frequency -->
<string-array name="split_frequency_options">
<item>No dividir</item>
<!-- Task frequency -->
<string-array name="task_frequency_options">
<item>Apagado</item>
<item>100 km</item>
<item>50 km</item>
<item>25 km</item>
@@ -130,8 +118,8 @@ limitations under the License.
<item>1 min</item>
</string-array>
<string-array name="split_frequency_options_ft">
<item>No dividir</item>
<string-array name="task_frequency_options_ft">
<item>Apagado</item>
<item>100 mi</item>
<item>50 mi</item>
<item>25 mi</item>
+6 -19
View File
@@ -15,18 +15,6 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<resources>
<!-- Task frequency -->
<string-array name="task_frequency_options">
<item>Absent</item>
<item>1 min</item>
<item>2 min</item>
<item>5 min</item>
<item>10 min</item>
<item>15 min</item>
<item>30 min</item>
<item>60 min</item>
</string-array>
<!-- Minimum recording distance -->
<string-array name="min_recording_distance_options">
<item>1 m</item>
@@ -112,10 +100,9 @@ limitations under the License.
<item>3.1 miles (mauvais signal GPS)</item>
</string-array>
<!-- Split frequency -->
<string-array name="split_frequency_options">
<item>Pas de séparation</item>
<!-- Task frequency -->
<string-array name="task_frequency_options">
<item>Absent</item>
<item>100 km</item>
<item>50 km</item>
<item>25 km</item>
@@ -131,8 +118,8 @@ limitations under the License.
<item>1 min</item>
</string-array>
<string-array name="split_frequency_options_ft">
<item>Pas de séparation</item>
<string-array name="task_frequency_options_ft">
<item>Absent</item>
<item>100 mi</item>
<item>50 mi</item>
<item>25 mi</item>
@@ -310,5 +297,5 @@ limitations under the License.
<item>Pont SRM ANT+</item>
<item>Bluetooth Zephyr</item>
</array>
</resources>
+5 -17
View File
@@ -15,18 +15,6 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<resources>
<!-- Task frequency -->
<string-array name="task_frequency_options">
<item>Disattivato</item>
<item>1 min</item>
<item>2 min</item>
<item>5 min</item>
<item>10 min</item>
<item>15 min</item>
<item>30 min</item>
<item>60 min</item>
</string-array>
<!-- Minimum recording distance -->
<string-array name="min_recording_distance_options">
<item>1 m</item>
@@ -112,9 +100,9 @@ limitations under the License.
<item>3.1 mi (segnale GPS debole)</item>
</string-array>
<!-- Split frequency -->
<string-array name="split_frequency_options">
<item>Non dividere</item>
<!-- Task frequency -->
<string-array name="task_frequency_options">
<item>Disattivato</item>
<item>100 km</item>
<item>50 km</item>
<item>25 km</item>
@@ -130,8 +118,8 @@ limitations under the License.
<item>1 min</item>
</string-array>
<string-array name="split_frequency_options_ft">
<item>Non dividere</item>
<string-array name="task_frequency_options_ft">
<item>Disattivato</item>
<item>100 mi</item>
<item>50 mi</item>
<item>25 mi</item>
+7 -22
View File
@@ -15,19 +15,7 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<resources>
<!-- Task frequency -->
<string-array name="task_frequency_options">
<item>不使用</item>
<item>1 分</item>
<item>2 分</item>
<item>5 分</item>
<item>10 分</item>
<item>15 分</item>
<item>30 分</item>
<item>60 分</item>
</string-array>
<!-- Minimum recording distance -->
<!-- Minimum recording distance -->
<string-array name="min_recording_distance_options">
<item>1 m</item>
<item>2 m</item>
@@ -48,7 +36,6 @@ limitations under the License.
<item>328 ft</item>
</string-array>
<!-- Maximum recording distance -->
<string-array name="max_recording_distance_options">
<item>50 m</item>
@@ -68,7 +55,6 @@ limitations under the License.
<item>3.1 mi</item>
</string-array>
<!-- Minimum recording interval -->
<string-array name="min_recording_interval_options">
<item>電源節約 (動的制御)</item>
@@ -89,7 +75,6 @@ limitations under the License.
<item>30 分</item>
</string-array>
<!-- Minimum required accuracy -->
<string-array name="min_required_accuracy_options">
<item>10 m (GPS信号強度良好)</item>
@@ -115,10 +100,9 @@ limitations under the License.
<item>3.1 mi (GPS信号強度不良)</item>
</string-array>
<!-- Split frequency -->
<string-array name="split_frequency_options">
<item>分割なし</item>
<!-- Task frequency -->
<string-array name="task_frequency_options">
<item>不使用</item>
<item>100 km</item>
<item>50 km</item>
<item>25 km</item>
@@ -134,8 +118,8 @@ limitations under the License.
<item>1 分</item>
</string-array>
<string-array name="split_frequency_options_ft">
<item>分割なし</item>
<string-array name="task_frequency_options_ft">
<item>不使用</item>
<item>100 mi</item>
<item>50 mi</item>
<item>25 mi</item>
@@ -294,4 +278,5 @@ limitations under the License.
<item>SRM ANT+ ブリッジ</item>
<item>Zephyr Bluetooth</item>
</array>
</resources>
+6 -18
View File
@@ -15,18 +15,6 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<resources>
<!-- Task frequency -->
<string-array name="task_frequency_options">
<item>Brak</item>
<item>1 min</item>
<item>2 min</item>
<item>5 min</item>
<item>10 min</item>
<item>15 min</item>
<item>30 min</item>
<item>60 min</item>
</string-array>
<!-- Minimum recording distance -->
<string-array name="min_recording_distance_options">
<item>1 m</item>
@@ -112,9 +100,9 @@ limitations under the License.
<item>3.1 mili (słaby sygnał GPS)</item>
</string-array>
<!-- Split frequency -->
<string-array name="split_frequency_options">
<item>Brak dzielenia</item>
<!-- Task frequency -->
<string-array name="task_frequency_options">
<item>Brak</item>
<item>100 km</item>
<item>50 km</item>
<item>25 km</item>
@@ -130,8 +118,8 @@ limitations under the License.
<item>1 min</item>
</string-array>
<string-array name="split_frequency_options_ft">
<item>Brak dzielenia</item>
<string-array name="task_frequency_options_ft">
<item>Brak</item>
<item>100 mi</item>
<item>50 mi</item>
<item>25 mi</item>
@@ -146,7 +134,7 @@ limitations under the License.
<item>2 min</item>
<item>1 min</item>
</string-array>
<!-- Auto-resume track timeout -->
<string-array name="auto_resume_track_timeout_options">
<item>Nigdy</item>
+19 -36
View File
@@ -15,21 +15,8 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<resources>
<!-- Task frequency -->
<array name="task_frequency_options">
<item>Desligado</item>
<item>1 min</item>
<item>2 min</item>
<item>5 min</item>
<item>10 min</item>
<item>15 min</item>
<item>30 min</item>
<item>60 min</item>
</array>
<!-- Minimum recording distance -->
<array name="min_recording_distance_options">
<string-array name="min_recording_distance_options">
<item>1 m</item>
<item>2 m</item>
<item>3 m</item>
@@ -37,9 +24,9 @@ limitations under the License.
<item>5 m (recomendada)</item>
<item>10 m</item>
<item>100 m</item>
</array>
</string-array>
<array name="min_recording_distance_options_ft">
<string-array name="min_recording_distance_options_ft">
<item>3 pés</item>
<item>6 pés</item>
<item>10 pés</item>
@@ -47,31 +34,29 @@ limitations under the License.
<item>16 pés (recomendado)</item>
<item>33 pés</item>
<item>328 pés</item>
</array>
</string-array>
<!-- Maximum recording distance -->
<array name="max_recording_distance_options">
<string-array name="max_recording_distance_options">
<item>50 m</item>
<item>100 m</item>
<item>200 m (recomendado)</item>
<item>500 m</item>
<item>1000 m</item>
<item>5000 m</item>
</array>
</string-array>
<array name="max_recording_distance_options_ft">
<string-array name="max_recording_distance_options_ft">
<item>164 pés</item>
<item>328 pés</item>
<item>656 pés (recomendado)</item>
<item>1640 pés</item>
<item>0.6 milhas</item>
<item>3.1 milhas</item>
</array>
</string-array>
<!-- Minimum recording interval -->
<array name="min_recording_interval_options">
<string-array name="min_recording_interval_options">
<item>economia de bateria (adaptativo)</item>
<item>alta precisão (adaptativo)</item>
<item>máxima (recomendada)</item>
@@ -88,11 +73,10 @@ limitations under the License.
<item>10 min</item>
<item>15 min</item>
<item>30 min</item>
</array>
</string-array>
<!-- Minimum required accuracy -->
<array name="min_required_accuracy_options">
<string-array name="min_required_accuracy_options">
<item>10 m (sinal de GPS excelente)</item>
<item>20 m</item>
<item>50 m</item>
@@ -102,9 +86,9 @@ limitations under the License.
<item>1000 m</item>
<item>2000 m</item>
<item>5000 m (sinal de GPS ruim)</item>
</array>
</string-array>
<array name="min_required_accuracy_options_ft">
<string-array name="min_required_accuracy_options_ft">
<item>33 pés (sinal de GPS excelente)</item>
<item>66 pés</item>
<item>165 pés</item>
@@ -114,12 +98,11 @@ limitations under the License.
<item>0.6 milhas</item>
<item>1.2 milhas</item>
<item>3.1 milhas (sinal de GPS ruim)</item>
</array>
</string-array>
<!-- Split frequency -->
<string-array name="split_frequency_options">
<item>Sem divisões</item>
<!-- Task frequency -->
<string-array name="task_frequency_options">
<item>Desligado</item>
<item>100 km</item>
<item>50 km</item>
<item>25 km</item>
@@ -135,8 +118,8 @@ limitations under the License.
<item>1 min</item>
</string-array>
<string-array name="split_frequency_options_ft">
<item>Sem divisões</item>
<string-array name="task_frequency_options_ft">
<item>Desligado</item>
<item>100 mi</item>
<item>50 mi</item>
<item>25 mi</item>
+5 -18
View File
@@ -15,18 +15,6 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<resources>
<!-- Task frequency -->
<string-array name="task_frequency_options">
<item>Av</item>
<item>1 min</item>
<item>2 min</item>
<item>5 min</item>
<item>10 min</item>
<item>15 min</item>
<item>30 min</item>
<item>60 min</item>
</string-array>
<!-- Minimum recording distance -->
<string-array name="min_recording_distance_options">
<item>1 m</item>
@@ -67,7 +55,6 @@ limitations under the License.
<item>3.1 miles</item>
</string-array>
<!-- Minimum recording interval -->
<string-array name="min_recording_interval_options">
<item>batterioptimerad (anpassningsbar)</item>
@@ -113,9 +100,9 @@ limitations under the License.
<item>3.1 miles (dålig GPS-signal)</item>
</string-array>
<!-- Split frequency -->
<string-array name="split_frequency_options">
<item>Ingen delning</item>
<!-- Task frequency -->
<string-array name="task_frequency_options">
<item>Av</item>
<item>100 km</item>
<item>50 km</item>
<item>25 km</item>
@@ -131,8 +118,8 @@ limitations under the License.
<item>1 min</item>
</string-array>
<string-array name="split_frequency_options_ft">
<item>Ingen delning</item>
<string-array name="task_frequency_options_ft">
<item>Av</item>
<item>100 mi</item>
<item>50 mi</item>
<item>25 mi</item>
+6 -17
View File
@@ -15,18 +15,6 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<resources>
<!-- Task frequency -->
<string-array name="task_frequency_options">
<item>关闭</item>
<item>1 分钟</item>
<item>2 分钟</item>
<item>5 分钟</item>
<item>10 分钟</item>
<item>15 分钟</item>
<item>30 分钟</item>
<item>60 分钟</item>
</string-array>
<!-- Minimum recording distance -->
<string-array name="min_recording_distance_options">
<item>1 米</item>
@@ -112,9 +100,9 @@ limitations under the License.
<item>3.1 英里 (糟糕的 GPS 信号)</item>
</string-array>
<!-- Split frequency -->
<string-array name="split_frequency_options">
<item>不分割</item>
<!-- Task frequency -->
<string-array name="task_frequency_options">
<item>关闭</item>
<item>100 千米</item>
<item>50 千米</item>
<item>25 千米</item>
@@ -130,8 +118,8 @@ limitations under the License.
<item>1 分钟</item>
</string-array>
<string-array name="split_frequency_options_ft">
<item>不分割</item>
<string-array name="task_frequency_options_ft">
<item>关闭</item>
<item>100 英里</item>
<item>50 英里</item>
<item>25 英里</item>
@@ -155,6 +143,7 @@ limitations under the License.
<item>15 分钟</item>
<item>总是</item>
</string-array>
<!-- Other non-preference arrays -->
<array name="activity_types">
<item>未知</item>
+5 -138
View File
@@ -15,31 +15,6 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<resources>
<!-- Task frequency -->
<string-array name="task_frequency_options">
<item>Off</item>
<item>1 min</item>
<item>2 min</item>
<item>5 min</item>
<item>10 min</item>
<item>15 min</item>
<item>30 min</item>
<item>60 min</item>
</string-array>
<!-- DO NOT TRANSLATE -->
<string-array name="task_frequency_values">
<item>-1</item>
<item>1</item>
<item>2</item>
<item>5</item>
<item>10</item>
<item>15</item>
<item>30</item>
<item>60</item>
</string-array>
<!-- Minimum recording distance -->
<string-array name="min_recording_distance_options">
<item>1 m</item>
@@ -61,18 +36,6 @@ limitations under the License.
<item>328 ft</item>
</string-array>
<!-- DO NOT TRANSLATE -->
<string-array name="min_recording_distance_values">
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item>5</item>
<item>10</item>
<item>100</item>
</string-array>
<!-- Maximum recording distance -->
<string-array name="max_recording_distance_options">
<item>50 m</item>
@@ -92,17 +55,6 @@ limitations under the License.
<item>3.1 miles</item>
</string-array>
<!-- DO NOT TRANSLATE -->
<string-array name="max_recording_distance_values">
<item>50</item>
<item>100</item>
<item>200</item>
<item>500</item>
<item>1000</item>
<item>5000</item>
</string-array>
<!-- Minimum recording interval -->
<string-array name="min_recording_interval_options">
<item>battery miser (adaptive)</item>
@@ -123,27 +75,6 @@ limitations under the License.
<item>30 min</item>
</string-array>
<!-- DO NOT TRANSLATE -->
<string-array name="min_recording_interval_values">
<item>-2</item>
<item>-1</item>
<item>0</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item>5</item>
<item>10</item>
<item>20</item>
<item>30</item>
<item>60</item>
<item>120</item>
<item>300</item>
<item>480</item>
<item>900</item>
<item>1800</item>
</string-array>
<!-- Minimum required accuracy -->
<string-array name="min_required_accuracy_options">
<item>10 m (excellent GPS signal)</item>
@@ -169,23 +100,9 @@ limitations under the License.
<item>3.1 miles (poor GPS signal)</item>
</string-array>
<!-- DO NOT TRANSLATE -->
<string-array name="min_required_accuracy_values">
<item>10</item>
<item>20</item>
<item>50</item>
<item>100</item>
<item>200</item>
<item>500</item>
<item>1000</item>
<item>2000</item>
<item>5000</item>
</string-array>
<!-- Split frequency -->
<string-array name="split_frequency_options">
<item>No splitting</item>
<!-- Task frequency -->
<string-array name="task_frequency_options">
<item>Off</item>
<item>100 km</item>
<item>50 km</item>
<item>25 km</item>
@@ -201,8 +118,8 @@ limitations under the License.
<item>1 min</item>
</string-array>
<string-array name="split_frequency_options_ft">
<item>No splitting</item>
<string-array name="task_frequency_options_ft">
<item>Off</item>
<item>100 mi</item>
<item>50 mi</item>
<item>25 mi</item>
@@ -218,24 +135,6 @@ limitations under the License.
<item>1 min</item>
</string-array>
<!-- DO NOT TRANSLATE -->
<string-array name="split_frequency_values">
<item>0</item>
<item>-100</item>
<item>-50</item>
<item>-25</item>
<item>-10</item>
<item>-5</item>
<item>-1</item>
<item>60</item>
<item>30</item>
<item>15</item>
<item>10</item>
<item>5</item>
<item>2</item>
<item>1</item>
</string-array>
<!-- Auto-resume track timeout -->
<string-array name="auto_resume_track_timeout_options">
<item>Never</item>
@@ -245,16 +144,6 @@ limitations under the License.
<item>Always</item>
</string-array>
<!-- DO NOT TRANSLATE -->
<string-array name="auto_resume_track_timeout_values">
<item>0</item>
<item>5</item>
<item>10</item>
<item>15</item>
<item>-1</item>
</string-array>
<!-- Other non-preference arrays -->
<array name="activity_types">
<item>unknown</item>
@@ -383,14 +272,6 @@ limitations under the License.
<item>way point</item>
</array>
<!-- DO NOT TRANSLATE -->
<array name="export_formats">
<item>GPX</item>
<item>KML</item>
<item>CSV</item>
<item>TCX</item>
</array>
<array name="sensor_type_options">
<item>None</item>
<item>ANT+ Sensors</item>
@@ -398,18 +279,4 @@ limitations under the License.
<item>Zephyr Bluetooth</item>
</array>
<!-- DO NOT TRANSLATE -->
<array name="sensor_type_values">
<item>@string/none</item>
<item>@string/ant_sensor_type</item>
<item>@string/srm_ant_bridge_sensor_type</item>
<item>@string/zephyr_sensor_type</item>
</array>
<!-- DO NOT TRANSLATE -->
<string-array name="ant_sensor_type_values">
<item>@string/ant_sensor_type</item>
<item>@string/srm_ant_bridge_sensor_type</item>
</string-array>
</resources>
@@ -0,0 +1,122 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2010 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<resources>
<!-- Do not translate any arrays in this file. -->
<string-array name="min_required_accuracy_values">
<item>10</item>
<item>20</item>
<item>50</item>
<item>100</item>
<item>200</item>
<item>500</item>
<item>1000</item>
<item>2000</item>
<item>5000</item>
</string-array>
<string-array name="min_recording_distance_values">
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item>5</item>
<item>10</item>
<item>100</item>
</string-array>
<string-array name="min_recording_distance_values">
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item>5</item>
<item>10</item>
<item>100</item>
</string-array>
<string-array name="max_recording_distance_values">
<item>50</item>
<item>100</item>
<item>200</item>
<item>500</item>
<item>1000</item>
<item>5000</item>
</string-array>
<string-array name="min_recording_interval_values">
<item>-2</item>
<item>-1</item>
<item>0</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item>5</item>
<item>10</item>
<item>20</item>
<item>30</item>
<item>60</item>
<item>120</item>
<item>300</item>
<item>480</item>
<item>900</item>
<item>1800</item>
</string-array>
<string-array name="task_frequency_values">
<item>0</item>
<item>-100</item>
<item>-50</item>
<item>-25</item>
<item>-10</item>
<item>-5</item>
<item>-1</item>
<item>60</item>
<item>30</item>
<item>15</item>
<item>10</item>
<item>5</item>
<item>2</item>
<item>1</item>
</string-array>
<string-array name="auto_resume_track_timeout_values">
<item>0</item>
<item>5</item>
<item>10</item>
<item>15</item>
<item>-1</item>
</string-array>
<array name="export_formats">
<item>GPX</item>
<item>KML</item>
<item>CSV</item>
<item>TCX</item>
</array>
<array name="sensor_type_values">
<item>@string/none</item>
<item>@string/ant_sensor_type</item>
<item>@string/srm_ant_bridge_sensor_type</item>
<item>@string/zephyr_sensor_type</item>
</array>
<string-array name="ant_sensor_type_values">
<item>@string/ant_sensor_type</item>
<item>@string/srm_ant_bridge_sensor_type</item>
</string-array>
</resources>
+2 -2
View File
@@ -48,8 +48,8 @@ limitations under the License.
android:key="@string/split_frequency_key"
android:title="@string/settings_split_frequency"
android:summary="@string/settings_split_frequency_summary"
android:entries="@array/split_frequency_options"
android:entryValues="@array/split_frequency_values"
android:entries="@array/task_frequency_options"
android:entryValues="@array/task_frequency_values"
android:defaultValue="0" />
<com.google.android.apps.mytracks.IntegerListPreference