New Privacy settings screen and Backup settings toggle. See #2132044 & #2133178

Also fixes 2138367: Share with Google setting doesn't get updated on checking the setting
And 2098232: "Set unlock pattern" should be at the top of the section
This commit is contained in:
Amith Yamasani
2009-09-22 13:50:19 -07:00
parent 0ce6f6dbc8
commit e65c943f97
8 changed files with 366 additions and 132 deletions

View File

@@ -0,0 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2009 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<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="settings_category"
android:title="@string/settings_section_title">
<!-- Backup settings -->
<CheckBoxPreference
android:key="backup_settings"
android:title="@string/backup_settings_title"
android:persistent="false" />
</PreferenceCategory>
<PreferenceCategory
android:title="@string/personal_data_section_title">
<!-- Factory reset -->
<PreferenceScreen
android:title="@string/master_clear_title"
android:summary="@string/master_clear_summary">
<intent android:action="android.intent.action.MAIN"
android:targetPackage="com.android.settings"
android:targetClass="com.android.settings.MasterClear" />
</PreferenceScreen>
</PreferenceCategory>
</PreferenceScreen>

View File

@@ -40,11 +40,6 @@
android:summaryOn="@string/assisted_gps_enabled"
android:summaryOff="@string/assisted_gps_disabled"/>
-->
<CheckBoxPreference
android:key="use_location"
android:title="@string/use_location_title"
android:persistent="false"
android:summary="@string/use_location_summary"/>
</PreferenceCategory>

View File

@@ -50,7 +50,7 @@
android:targetClass="com.android.settings.SoundAndDisplaySettings" />
</com.android.settings.IconPreferenceScreen>
<!-- Security & Privacy -->
<!-- Security & Location -->
<com.android.settings.IconPreferenceScreen
settings:icon="@drawable/ic_settings_security"
@@ -85,6 +85,18 @@
<intent android:action="android.settings.SYNC_SETTINGS" />
</com.android.settings.IconPreferenceScreen>
<!-- Privacy -->
<com.android.settings.IconPreferenceScreen
settings:icon="@drawable/ic_settings_privacy"
android:title="@string/privacy_settings"
android:key="privacy_settings">
<intent
android:action="android.intent.action.MAIN"
android:targetPackage="com.android.settings"
android:targetClass="com.android.settings.PrivacySettings" />
</com.android.settings.IconPreferenceScreen>
<!-- Storage -->
<com.android.settings.IconPreferenceScreen