diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-07-26 16:12:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-07-26 16:12:51 -0700 |
| commit | 09f2f5afc1f6e3795dd9d361023e908bfabd6f2f (patch) | |
| tree | 86075f1f725be73bd88d81e4abb74be08b01b5c7 /res/xml | |
| parent | a7bb69228dba715f6b9c7d60599aff2bdb38df4b (diff) | |
| parent | 2d018a8b0d2f0a7e7c3ee9ea2d9ba7df3a161604 (diff) | |
| download | packages_apps_settings-09f2f5afc1f6e3795dd9d361023e908bfabd6f2f.zip packages_apps_settings-09f2f5afc1f6e3795dd9d361023e908bfabd6f2f.tar.gz packages_apps_settings-09f2f5afc1f6e3795dd9d361023e908bfabd6f2f.tar.bz2 | |
am 2d018a8b: am 07841668: Merge "Move Google-apps specific location settings to a Google package" into jb-dev
* commit '2d018a8b0d2f0a7e7c3ee9ea2d9ba7df3a161604':
Move Google-apps specific location settings to a Google package
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/location_settings.xml | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml index 8d8757d..ab212d8 100644 --- a/res/xml/location_settings.xml +++ b/res/xml/location_settings.xml @@ -17,15 +17,29 @@ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" android:title="@string/location_settings_title"> - <CheckBoxPreference - android:key="location_network" - android:title="@string/location_network_based" - android:summary="@string/location_neighborhood_level"/> + <com.android.settings.WrappingSwitchPreference + android:key="location_toggle" + android:title="@string/location_access_title" + android:summary="@string/location_access_summary" + android:persistent="true"/> + + <PreferenceCategory + android:key="location_sources" + android:title="@string/location_sources_heading" /> <CheckBoxPreference android:key="location_gps" android:title="@string/location_gps" - android:summary="@string/location_street_level"/> + android:summary="@string/location_street_level" + android:dependency="location_toggle" + android:persistent="false" /> + + <com.android.settings.WrappingCheckBoxPreference + android:key="location_network" + android:title="@string/location_network_based" + android:summary="@string/location_neighborhood_level" + android:dependency="location_toggle" + android:persistent="false" /> <!-- 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. |