Merge heads

This commit is contained in:
youtaol
2013-07-10 14:19:41 +08:00
parent fd3940fcd0
commit 4debca0054
220 changed files with 359 additions and 293 deletions
+4 -4
View File
@@ -38,16 +38,16 @@ limitations under the License.
android:key="@string/min_recording_interval_key"
android:title="@string/settings_recording_min_recording_interval_title" />
<com.google.android.apps.mytracks.IntegerListPreference
android:defaultValue="5"
android:key="@string/min_recording_distance_key"
android:defaultValue="10"
android:key="@string/recording_distance_interval_key"
android:title="@string/settings_recording_min_recording_distance_title" />
<com.google.android.apps.mytracks.IntegerListPreference
android:defaultValue="200"
android:key="@string/max_recording_distance_key"
android:title="@string/settings_recording_max_recording_distance_title" />
<com.google.android.apps.mytracks.IntegerListPreference
android:defaultValue="200"
android:key="@string/min_required_accuracy_key"
android:defaultValue="50"
android:key="@string/recording_gps_accuracy_key"
android:title="@string/settings_recording_min_required_accuracy_title" />
<com.google.android.apps.mytracks.IntegerListPreference
android:defaultValue="10"