diff options
author | Christopher Baines <cbaines8@gmail.com> | 2012-02-28 22:27:49 +0000 |
---|---|---|
committer | Christopher Baines <cbaines8@gmail.com> | 2012-02-28 22:27:49 +0000 |
commit | cde3c08d7e9e486d7d1a795832ea1b767d96a4f3 (patch) | |
tree | f1af1424ebf5cb3a548a7d73257723395dccb267 /res/xml/preferences.xml | |
parent | 7e88b00e017bde16c12e6adb78883acf7b2ba575 (diff) | |
parent | 5f2b8712079aeb5b7cee476b06b36013edac4fb3 (diff) | |
download | southamptonuniversitymap-cde3c08d7e9e486d7d1a795832ea1b767d96a4f3.tar southamptonuniversitymap-cde3c08d7e9e486d7d1a795832ea1b767d96a4f3.tar.gz |
Merge branch 'dev'
Conflicts:
src/net/cbaines/suma/BusSpecificStopView.java
src/net/cbaines/suma/StopView.java
Diffstat (limited to 'res/xml/preferences.xml')
-rw-r--r-- | res/xml/preferences.xml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 4a12e1c..9de3a61 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -3,6 +3,15 @@ <PreferenceCategory android:orderingFromXml="true" + android:title="@string/preferences_catagory_appearance" > + <CheckBoxPreference + android:key="showIdentifiers" + android:summaryOff="@string/preferences_show_identifiers_disabled" + android:summaryOn="@string/preferences_show_identifiers_enabled" + android:title="@string/preferences_show_identifiers" /> + </PreferenceCategory> + <PreferenceCategory + android:orderingFromXml="true" android:title="@string/preferences_catagory_positioning" > <CheckBoxPreference android:key="GPSEnabled" |