xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- add compass

Browse Source 
- add 'fix orientation' option
- bugfix segv in limitLoadQueue
- remove redundant MapController
- refactor out Location stuff from TileMap
This commit is contained in:
Hannes Janetzek
2012-09-11 04:06:59 +02:00
parent baa40ed9ea
commit 53636cff30
16 changed files with 756 additions and 597 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
res/xml/preferences.xml
View File

@@ -1,40 +1,71 @@
<?xml version="1.0" encoding="UTF-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" android:title="@string/menu_preferences">
<PreferenceCategory android:title="@string/preferences_map">
<!-- <CheckBoxPreference android:title="@string/preferences_show_scale_bar" android:summary="@string/preferences_show_scale_bar_desc"
android:key="showScaleBar" /> -->
<!-- <ListPreference android:title="@string/preferences_scale_bar_unit" android:summary="@string/preferences_scale_bar_unit_desc"
android:entryValues="@array/preferences_scale_bar_unit_keys" android:entries="@array/preferences_scale_bar_unit_values"
android:key="scaleBarUnit" android:defaultValue="@string/preferences_scale_bar_unit_default" android:dependency="showScaleBar" /> -->
<ListPreference android:title="@string/preferences_map_view_mode" android:summary="@string/preferences_map_view_mode_desc"
android:entryValues="@array/preferences_map_database_keys" android:entries="@array/preferences_map_generator_values"
android:key="mapDatabase" android:defaultValue="@string/preferences_map_database_default" />
<!-- <ListPreference android:title="@string/preferences_text_scale" android:summary="@string/preferences_text_scale_desc"
android:entryValues="@array/preferences_text_scale_keys" android:entries="@array/preferences_text_scale_values"
android:key="textScale" android:defaultValue="@string/preferences_text_scale_default" /> -->
</PreferenceCategory>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/menu_preferences" >
<PreferenceCategory android:title="@string/preferences_general">
<CheckBoxPreference android:title="@string/preferences_fullscreen" android:summary="@string/preferences_fullscreen_desc"
android:key="fullscreen" />
<CheckBoxPreference android:title="@string/preferences_wake_lock" android:summary="@string/preferences_wake_lock_desc"
android:key="wakeLock" />
<!-- <CheckBoxPreference android:title="@string/preferences_cache_persistence" android:summary="@string/preferences_cache_persistence_desc"
<PreferenceCategory android:title="@string/preferences_map" >
<!--
<CheckBoxPreference android:title="@string/preferences_show_scale_bar" android:summary="@string/preferences_show_scale_bar_desc"
android:key="showScaleBar" />
-->
<!--
<ListPreference android:title="@string/preferences_scale_bar_unit" android:summary="@string/preferences_scale_bar_unit_desc"
android:entryValues="@array/preferences_scale_bar_unit_keys" android:entries="@array/preferences_scale_bar_unit_values"
android:key="scaleBarUnit" android:defaultValue="@string/preferences_scale_bar_unit_default" android:dependency="showScaleBar" />
-->
<ListPreference
android:defaultValue="@string/preferences_map_database_default"
android:entries="@array/preferences_map_generator_values"
android:entryValues="@array/preferences_map_database_keys"
android:key="mapDatabase"
android:summary="@string/preferences_map_view_mode_desc"
android:title="@string/preferences_map_view_mode" />
<!--
<ListPreference android:title="@string/preferences_text_scale" android:summary="@string/preferences_text_scale_desc"
android:entryValues="@array/preferences_text_scale_keys" android:entries="@array/preferences_text_scale_values"
android:key="textScale" android:defaultValue="@string/preferences_text_scale_default" />
-->
</PreferenceCategory>
<PreferenceCategory android:title="@string/preferences_general" >
<CheckBoxPreference
android:key="fullscreen"
android:summary="@string/preferences_fullscreen_desc"
android:title="@string/preferences_fullscreen" />
<CheckBoxPreference
android:key="fixOrientation"
android:summary="@string/preferences_fix_orientation"
android:title="@string/preferences_fix_orientation_desc" />
<CheckBoxPreference
android:key="wakeLock"
android:summary="@string/preferences_wake_lock_desc"
android:title="@string/preferences_wake_lock" />
<!--
<CheckBoxPreference android:title="@string/preferences_cache_persistence" android:summary="@string/preferences_cache_persistence_desc"
android:key="cachePersistence" />
<de.sfb.pampa.preferences.CacheSizePreference
android:title="@string/preferences_cache_size" android:summary="@string/preferences_cache_size_desc" android:key="cacheSize" />
<de.sfb.pampa.preferences.MoveSpeedPreference
android:title="@string/preferences_move_speed" android:summary="@string/preferences_move_speed_desc" android:key="moveSpeed" /> -->
</PreferenceCategory>
android:title="@string/preferences_move_speed" android:summary="@string/preferences_move_speed_desc" android:key="moveSpeed" />
-->
</PreferenceCategory>
<PreferenceCategory android:title="@string/preferences_debug" >
<!--
<CheckBoxPreference android:title="@string/preferences_show_fps_counter" android:summary="@string/preferences_show_fps_counter_desc"
android:key="showFpsCounter" />
-->
<CheckBoxPreference
android:key="drawTileFrames"
android:summary="@string/preferences_show_tile_frames_desc"
android:title="@string/preferences_show_tile_frames" />
<CheckBoxPreference
android:key="drawUnmatchedWays"
android:summary="@string/preferences_show_unmatched_ways"
android:title="@string/preferences_show_unmatched_ways" />
<CheckBoxPreference
android:key="disablePolygons"
android:summary="@string/preferences_disable_polygons"
android:title="@string/preferences_disable_polygons" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/preferences_debug">
<!-- <CheckBoxPreference android:title="@string/preferences_show_fps_counter" android:summary="@string/preferences_show_fps_counter_desc"
android:key="showFpsCounter" /> -->
<CheckBoxPreference android:title="@string/preferences_show_tile_frames" android:summary="@string/preferences_show_tile_frames_desc"
android:key="drawTileFrames" />
<CheckBoxPreference android:title="@string/preferences_show_unmatched_ways" android:summary="@string/preferences_show_unmatched_ways"
android:key="drawUnmatchedWays" />
<CheckBoxPreference android:title="@string/preferences_disable_polygons" android:summary="@string/preferences_disable_polygons"
android:key="disablePolygons" />
</PreferenceCategory>
</PreferenceScreen>