diff options
| author | Lifu Tang <lifu@google.com> | 2013-07-30 18:43:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-30 18:43:16 +0000 |
| commit | 040ce605826af509f6391e3536204c07476dc28a (patch) | |
| tree | 8f8ae4fd50ae8245dc50091d105928be90443873 /res | |
| parent | 44214d46ec2b035b805100e1a3b6479ee2a377ce (diff) | |
| parent | 83ab7c932e59fd23799f5db723e80d411918a9a5 (diff) | |
| download | packages_apps_Settings-040ce605826af509f6391e3536204c07476dc28a.tar.gz packages_apps_Settings-040ce605826af509f6391e3536204c07476dc28a.tar.bz2 packages_apps_Settings-040ce605826af509f6391e3536204c07476dc28a.zip | |
Merge "Moved LocationSettings into location sub-package"
Diffstat (limited to 'res')
| -rw-r--r-- | res/xml/location_settings.xml | 4 | ||||
| -rw-r--r-- | res/xml/settings_headers.xml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml index ab212d82b..246a383f4 100644 --- a/res/xml/location_settings.xml +++ b/res/xml/location_settings.xml @@ -17,7 +17,7 @@ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" android:title="@string/location_settings_title"> - <com.android.settings.WrappingSwitchPreference + <com.android.settings.location.WrappingSwitchPreference android:key="location_toggle" android:title="@string/location_access_title" android:summary="@string/location_access_summary" @@ -34,7 +34,7 @@ android:dependency="location_toggle" android:persistent="false" /> - <com.android.settings.WrappingCheckBoxPreference + <com.android.settings.location.WrappingCheckBoxPreference android:key="location_network" android:title="@string/location_network_based" android:summary="@string/location_neighborhood_level" diff --git a/res/xml/settings_headers.xml b/res/xml/settings_headers.xml index 5d3a39fd7..9a1d3b830 100644 --- a/res/xml/settings_headers.xml +++ b/res/xml/settings_headers.xml @@ -125,7 +125,7 @@ <!-- Location --> <header - android:fragment="com.android.settings.LocationSettings" + android:fragment="com.android.settings.location.LocationSettings" android:icon="@drawable/ic_settings_location" android:title="@string/location_settings_title" android:id="@+id/location_settings" /> |