From e63142329060fabe105a8fd939cb637d530ae4a3 Mon Sep 17 00:00:00 2001 From: Lifu Tang Date: Tue, 6 Aug 2013 13:31:50 -0700 Subject: [PATCH] Finished the location settings Change-Id: I333fcc74ad387ef6edaa558656d3eaa91feb8fe9 --- AndroidManifest.xml | 1 + res/values/strings.xml | 8 +- res/xml/location_settings.xml | 2 +- .../android/settings/location/LocationEnabler.java | 76 ------------ .../android/settings/location/LocationMode.java | 95 ++++++++++++-- .../settings/location/LocationSettings.java | 90 +++++++++++--- .../settings/location/LocationSettingsBase.java | 138 +++++++++++++++++++++ .../settings/location/RadioButtonPreference.java | 28 +++++ 8 files changed, 333 insertions(+), 105 deletions(-) delete mode 100644 src/com/android/settings/location/LocationEnabler.java create mode 100644 src/com/android/settings/location/LocationSettingsBase.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 2da0e4e5ae..10c3adbf28 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -818,6 +818,7 @@ Battery saving Device sensors only + + Location off Recent location requests Location services Location mode - + Use GPS, Wi\u2011Fi and mobile networks to estimate location - + Use Wi\u2011Fi and mobile networks to estimate location - + Use GPS to pinpoint your location diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml index 293b7722d2..e646cab3ac 100644 --- a/res/xml/location_settings.xml +++ b/res/xml/location_settings.xml @@ -22,7 +22,7 @@ + android:summary="@string/location_mode_location_off_title" />