diff options
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/development_prefs.xml | 5 | ||||
| -rw-r--r-- | res/xml/device_info_settings.xml | 6 | ||||
| -rw-r--r-- | res/xml/location_settings.xml | 24 |
3 files changed, 30 insertions, 5 deletions
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml index 6cb8238..47e58da 100644 --- a/res/xml/development_prefs.xml +++ b/res/xml/development_prefs.xml @@ -16,6 +16,11 @@ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" android:title="@string/development_settings_title"> + <com.android.settings.BugreportPreference + android:key="bugreport" + android:title="@string/bugreport_title" + android:dialogTitle="@string/bugreport_title" /> + <PreferenceScreen android:key="local_backup_password" android:title="@string/local_backup_password_title" diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml index 3121867..324deaa 100644 --- a/res/xml/device_info_settings.xml +++ b/res/xml/device_info_settings.xml @@ -100,6 +100,12 @@ style="?android:preferenceInformationStyle" android:title="@string/firmware_version" android:summary="@string/device_info_default"/> + + <!-- Device FCC equipment id --> + <Preference android:key="fcc_equipment_id" + style="?android:preferenceInformationStyle" + android:title="@string/fcc_equipment_id" + android:summary="@string/device_info_default"/> <!-- Device Baseband version --> <Preference android:key="baseband_version" 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. |