summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--res/values/strings.xml10
-rw-r--r--res/xml/privacy_settings.xml5
-rw-r--r--src/com/android/settings/PrivacySettings.java4
3 files changed, 11 insertions, 8 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 55edd96..600a54d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2481,15 +2481,17 @@ found in the list of installed applications.</string>
<!-- Privacy settings activity title -->
<string name="privacy_settings_title">Privacy settings</string>
<!-- Backup section title -->
- <string name="backup_section_title">Backup and Restore</string>
+ <string name="backup_section_title">Backup and restore</string>
<!-- Personal data section title -->
<string name="personal_data_section_title">Personal data</string>
- <!-- Backup settings menu title -->
- <string name="backup_settings_title">Back up my settings</string>
+ <!-- Backup data menu title -->
+ <string name="backup_data_title">Back up data</string>
+ <!-- Summary text of the "back up data" setting -->
+ <string name="backup_data_summary">Back up settings and other application data.</string>
<!-- Auto-restore menu title -->
<string name="auto_restore_title">Automatic restore</string>
<!-- Summary text of the "automatic restore" setting -->
- <string name="auto_restore_summary">Restore applications\' data from backup when they are installed</string>
+ <string name="auto_restore_summary">If I reinstall an application, restore backed up settings or other data.</string>
<!-- Dialog title for confirmation to erase backup data from server -->
<string name="backup_erase_dialog_title">Backup</string>
<!-- Dialog title for confirmation to erase backup data from server -->
diff --git a/res/xml/privacy_settings.xml b/res/xml/privacy_settings.xml
index cb145d5..7ac14dc 100644
--- a/res/xml/privacy_settings.xml
+++ b/res/xml/privacy_settings.xml
@@ -20,8 +20,9 @@
android:title="@string/backup_section_title">
<!-- Backup settings -->
<CheckBoxPreference
- android:key="backup_settings"
- android:title="@string/backup_settings_title"
+ android:key="backup_data"
+ android:title="@string/backup_data_title"
+ android:summary="@string/backup_data_summary"
android:persistent="false" />
<CheckBoxPreference
android:key="auto_restore"
diff --git a/src/com/android/settings/PrivacySettings.java b/src/com/android/settings/PrivacySettings.java
index 28d823d..29deacf 100644
--- a/src/com/android/settings/PrivacySettings.java
+++ b/src/com/android/settings/PrivacySettings.java
@@ -44,7 +44,7 @@ public class PrivacySettings extends PreferenceActivity implements
// Vendor specific
private static final String GSETTINGS_PROVIDER = "com.google.settings";
private static final String BACKUP_CATEGORY = "backup_category";
- private static final String BACKUP_SETTINGS = "backup_settings";
+ private static final String BACKUP_DATA = "backup_data";
private static final String AUTO_RESTORE = "auto_restore";
private CheckBoxPreference mBackup;
private CheckBoxPreference mAutoRestore;
@@ -59,7 +59,7 @@ public class PrivacySettings extends PreferenceActivity implements
addPreferencesFromResource(R.xml.privacy_settings);
final PreferenceScreen screen = getPreferenceScreen();
- mBackup = (CheckBoxPreference) screen.findPreference(BACKUP_SETTINGS);
+ mBackup = (CheckBoxPreference) screen.findPreference(BACKUP_DATA);
mAutoRestore = (CheckBoxPreference) screen.findPreference(AUTO_RESTORE);
// Vendor specific