diff options
| author | Christopher Baines <cbaines8@gmail.com> | 2012-02-19 10:42:04 +0000 |
|---|---|---|
| committer | Christopher Baines <cbaines8@gmail.com> | 2012-02-19 10:42:04 +0000 |
| commit | 40bd59ae8615f05c8f9d1b542f35ae39f98c2f5d (patch) | |
| tree | b6a6fa2fdbb7009859ef0ca4616a8b9c59169440 /res/xml | |
| parent | 4b4a5a0ebc7f285d7cdcfa1d72640dbc097bdbb2 (diff) | |
| parent | a02e8ae9eed3b2e3c105db19e84c27a0774172dd (diff) | |
| download | southamptonuniversitymap-40bd59ae8615f05c8f9d1b542f35ae39f98c2f5d.tar southamptonuniversitymap-40bd59ae8615f05c8f9d1b542f35ae39f98c2f5d.tar.gz | |
Merge branch 'dev'
Conflicts:
AndroidManifest.xml
res/values/strings.xml
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/preferences.xml | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 8aec00c..4a12e1c 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -12,12 +12,26 @@ </PreferenceCategory> <PreferenceCategory android:orderingFromXml="true" - android:title="@string/preferences_catagory_bus_times" > + android:title="@string/preferences_catagory_live_bus_times" > <CheckBoxPreference - android:key="liveBusTimesEnabled" - android:summaryOff="@string/preferences_live_bus_times_disabled" - android:summaryOn="@string/preferences_live_bus_times_enabled" - android:title="@string/preferences_live_bus_times" /> + android:key="uniLinkLiveBusTimesEnabled" + android:summaryOff="@string/preferences_uni_link_live_bus_times_disabled" + android:summaryOn="@string/preferences_uni_link_live_bus_times_enabled" + android:title="@string/preferences_uni_link_live_bus_times" /> + <CheckBoxPreference + android:key="nonUniLinkLiveBusTimesEnabled" + android:summaryOff="@string/preferences_non_uni_link_live_bus_times_disabled" + android:summaryOn="@string/preferences_non_uni_link_live_bus_times_enabled" + android:title="@string/preferences_non_uni_link_live_bus_times" /> + </PreferenceCategory> + <PreferenceCategory + android:orderingFromXml="true" + android:title="@string/preferences_catagory_data" > + <CheckBoxPreference + android:key="nonUniLinkBusStops" + android:summaryOff="@string/preferences_non_uni_link_disabled" + android:summaryOn="@string/preferences_non_uni_link_enabled" + android:title="@string/preferences_non_uni_link" /> </PreferenceCategory> </PreferenceScreen>
\ No newline at end of file |