PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 22611 into eclair

Browse Source 
* changes:
  Hide the "Enable Assisted GPS" checkbox in security & location settings.
This commit is contained in:
Android (Google) Code Review
2009-08-25 11:55:20 -07:00
parent e13209ab42 7f894124f4
commit cfb4089b37
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/xml/security_settings.xml
View File

@@ -32,12 +32,14 @@
android:summaryOn="@string/location_street_level" android:summaryOn="@string/location_street_level"
android:summaryOff="@string/location_gps_disabled"/> android:summaryOff="@string/location_gps_disabled"/>
<!-- Disabled to avoid confusion on devices with no AGPS
For Google experience devices we want AGPS on by default (if supported) so we don't really need this.
<CheckBoxPreference <CheckBoxPreference
android:key="assisted_gps" android:key="assisted_gps"
android:title="@string/assisted_gps" android:title="@string/assisted_gps"
android:summaryOn="@string/assisted_gps_enabled" android:summaryOn="@string/assisted_gps_enabled"
android:summaryOff="@string/assisted_gps_disabled"/> android:summaryOff="@string/assisted_gps_disabled"/>
-->
<CheckBoxPreference <CheckBoxPreference
android:key="use_location" android:key="use_location"
android:title="@string/use_location_title" android:title="@string/use_location_title"

4
src/com/android/settings/SecuritySettings.java
View File

@@ -305,7 +305,9 @@ public class SecuritySettings extends PreferenceActivity implements
boolean enabled = mGps.isChecked(); boolean enabled = mGps.isChecked();
Settings.Secure.setLocationProviderEnabled(getContentResolver(), Settings.Secure.setLocationProviderEnabled(getContentResolver(),
LocationManager.GPS_PROVIDER, enabled); LocationManager.GPS_PROVIDER, enabled);
if (mAssistedGps != null) {
mAssistedGps.setEnabled(enabled); mAssistedGps.setEnabled(enabled);
}
} else if (preference == mAssistedGps) { } else if (preference == mAssistedGps) {
Settings.Secure.putInt(getContentResolver(), Settings.Secure.ASSISTED_GPS_ENABLED, Settings.Secure.putInt(getContentResolver(), Settings.Secure.ASSISTED_GPS_ENABLED,
mAssistedGps.isChecked() ? 1 : 0); mAssistedGps.isChecked() ? 1 : 0);
@@ -355,9 +357,11 @@ public class SecuritySettings extends PreferenceActivity implements
mNetwork.setChecked(Settings.Secure.isLocationProviderEnabled( mNetwork.setChecked(Settings.Secure.isLocationProviderEnabled(
res, LocationManager.NETWORK_PROVIDER)); res, LocationManager.NETWORK_PROVIDER));
mGps.setChecked(gpsEnabled); mGps.setChecked(gpsEnabled);
if (mAssistedGps != null) {
mAssistedGps.setChecked(Settings.Secure.getInt(res, mAssistedGps.setChecked(Settings.Secure.getInt(res,
Settings.Secure.ASSISTED_GPS_ENABLED, 2) == 1); Settings.Secure.ASSISTED_GPS_ENABLED, 2) == 1);
mAssistedGps.setEnabled(gpsEnabled); mAssistedGps.setEnabled(gpsEnabled);
}
mUseLocation.setChecked(Settings.Secure.getInt(res, mUseLocation.setChecked(Settings.Secure.getInt(res,
Settings.Secure.USE_LOCATION_FOR_SERVICES, 2) == 1); Settings.Secure.USE_LOCATION_FOR_SERVICES, 2) == 1);
} }