Merge "Remove USE_LOCATION_FOR_SERVICES from Settings"

This commit is contained in:
Bjorn Bringert
2010-02-10 03:37:20 -08:00
committed by Android (Google) Code Review
4 changed files with 4 additions and 140 deletions

View File

@@ -1302,17 +1302,6 @@
<string name="assisted_gps_enabled">Use server to assist GPS (uncheck to reduce network usage)</string>
<!-- Security & location settings screen, setting summary when Assisted GPS check box is clear -->
<string name="assisted_gps_disabled">Use server to assist GPS (uncheck to improve GPS performance)</string>
<!-- Setting title for allow sending location to google -->
<string name="use_location_title">Use My Location</string>
<!-- Setting summary for allowing Google to use location information for improved search results. -->
<string name="use_location_summary">Use My Location for Google search results and other Google services</string>
<!-- Message of dialog to user requesting use of location information -->
<string name="use_location_warning_message">Do you want to allow Google to use location for improved search results and other services?</string>
<!-- Agree -->
<string name="agree">Agree</string>
<!-- Disagree -->
<string name="disagree">Disagree</string>
<!-- About --> <skip />
<!-- Main settings screen, setting title for the user to go into the About phone screen -->
@@ -2270,8 +2259,6 @@ found in the list of installed applications.</string>
<string name="privacy_settings">Privacy</string>
<!-- Privacy settings activity title -->
<string name="privacy_settings_title">Privacy settings</string>
<!-- Location settings section title -->
<string name="location_section_title">Location</string>
<!-- Backup section title -->
<string name="backup_section_title">Backup and Restore</string>
<!-- Personal data section title -->

View File

@@ -16,16 +16,6 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory android:key="location_category"
android:title="@string/location_section_title">
<!-- Share location with Google -->
<CheckBoxPreference
android:key="use_location"
android:title="@string/use_location_title"
android:persistent="false"
android:summary="@string/use_location_summary"/>
</PreferenceCategory>
<PreferenceCategory android:key="backup_category"
android:title="@string/backup_section_title">
<!-- Backup settings -->