phillip/ingress-intel-total-conversion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mobile/user-location: Do not reload when switching between loc+sensor and loc-only

Browse Source
This commit is contained in:
fkloft
2013-12-23 20:35:19 +01:00
parent 7f82671276
commit 2823450857
6 changed files with 130 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mobile/res/values/strings.xml
View File

@ -83,11 +83,7 @@
<string name="pref_tweaks_cat">Tweaks</string>
<string name="pref_plugins">IITC Plugins</string>
<string name="pref_plugins_title">Available plugins</string>
<string name="pref_user_loc_screen">User location</string>
<string name="pref_user_loc">Display user location</string>
<string name="pref_user_loc_sum">Show users position on map</string>
<string name="pref_user_loc_sensor">Use sensor orientation</string>
<string name="pref_user_loc_sensor_sum">Experimental! Fancier but eats battery packs for breakfast</string>
<string name="pref_user_location">Display user location on map</string>
<string name="pref_user_zoom">Show zoom control</string>
<string name="pref_user_zoom_sum">Shows +/- buttons even on multitouch capable devices.</string>
<string name="pref_fullscreen">Hide in fullscreen mode</string>
@ -128,6 +124,16 @@
<item>8</item>
<item>16</item>
</string-array>
<string-array name="pref_user_location_titles">
<item>Don\'t show user position</item>
<item>Show user position on map</item>
<item>Show user position and orientation on map</item>
</string-array>
<string-array name="pref_user_location_values">
<item>0</item>
<item>1</item>
<item>2</item>
</string-array>
<string name="menu_clear_cookies">Clear Cookies</string>
<string name="menu_search">Search</string>

46
mobile/res/xml/preferences.xml
View File

@ -14,33 +14,26 @@
<PreferenceCategory
android:key="pref_ui_cat"
android:title="@string/pref_ui_cat">
<PreferenceScreen
android:key="pref_user_loc_screen"
android:persistent="false"
android:title="@string/pref_user_loc_screen">
<CheckBoxPreference
android:defaultValue="false"
android:key="pref_user_loc"
android:summary="@string/pref_user_loc_sum"
android:title="@string/pref_user_loc"/>
<CheckBoxPreference
android:defaultValue="true"
android:key="pref_user_loc_sensor"
android:dependency="pref_user_loc"
android:summary="@string/pref_user_loc_sensor_sum"
android:title="@string/pref_user_loc_sensor"/>
</PreferenceScreen>
<ListPreference
android:defaultValue="0"
android:entries="@array/pref_user_location_titles"
android:entryValues="@array/pref_user_location_values"
android:key="pref_user_location_mode"
android:title="@string/pref_user_location"/>
<CheckBoxPreference
android:defaultValue="false"
android:key="pref_user_zoom"
android:summary="@string/pref_user_zoom_sum"
android:title="@string/pref_user_zoom"/>
<MultiSelectListPreference
android:entries="@array/pref_hide_fullscreen"
android:entryValues="@array/pref_hide_fullscreen_vals"
android:key="pref_fullscreen"
android:summary="@string/pref_fullscreen_sum"
android:title="@string/pref_fullscreen"
android:entries="@array/pref_hide_fullscreen"
android:entryValues="@array/pref_hide_fullscreen_vals"/>
android:title="@string/pref_fullscreen"/>
<CheckBoxPreference
android:defaultValue="false"
android:key="pref_force_desktop"
@ -50,7 +43,6 @@
<PreferenceCategory
android:key="pref_mics"
android:title="@string/pref_misc_cat">
<PreferenceScreen
android:fragment="com.cradle.iitc_mobile.fragments.PluginsFragment"
android:key="pref_plugins"
@ -67,15 +59,15 @@
android:summary="@string/pref_force_https_sum"
android:title="@string/pref_force_https"/>
<CheckBoxPreference
android:defaultValue="false"
android:key="pref_external_storage"
android:title="@string/pref_external_storage"
android:summary="@string/pref_external_storage_sum"
android:defaultValue="false" />
android:title="@string/pref_external_storage"/>
<CheckBoxPreference
android:key="pref_press_twice_to_exit"
android:title="@string/pref_press_twice_to_exit"
android:summary="@string/pref_press_twice_to_exit_sum"
android:defaultValue="false" />
android:defaultValue="false"
android:key="pref_press_twice_to_exit"
android:summary="@string/pref_press_twice_to_exit_sum"
android:title="@string/pref_press_twice_to_exit"/>
</PreferenceCategory>
<PreferenceCategory
android:key="pref_developer_options"
@ -121,4 +113,4 @@
</PreferenceScreen>
</PreferenceCategory>
</PreferenceScreen>
</PreferenceScreen>