diff options
author | Kenny Root <kroot@google.com> | 2010-06-03 15:02:13 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-03 15:02:13 -0700 |
commit | 273464d5a1369a784eebeebaa4a4f8b4371b7699 (patch) | |
tree | e45315b4ea8c5d8eab2a427302885377bc169e59 | |
parent | a496684019497395b71c6d460501197a74e21e0e (diff) | |
parent | aa1f8aeeea1c27fe88270cc8b5df970d9f292385 (diff) | |
download | packages_apps_Settings-273464d5a1369a784eebeebaa4a4f8b4371b7699.zip packages_apps_Settings-273464d5a1369a784eebeebaa4a4f8b4371b7699.tar.gz packages_apps_Settings-273464d5a1369a784eebeebaa4a4f8b4371b7699.tar.bz2 |
am aa1f8aee: Clarify backup setting
Merge commit 'aa1f8aeeea1c27fe88270cc8b5df970d9f292385' into froyo-plus-aosp
* commit 'aa1f8aeeea1c27fe88270cc8b5df970d9f292385':
Clarify backup setting
-rw-r--r-- | res/values/strings.xml | 10 | ||||
-rw-r--r-- | res/xml/privacy_settings.xml | 5 | ||||
-rw-r--r-- | src/com/android/settings/PrivacySettings.java | 4 |
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 |