summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2010-06-03 15:02:13 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-06-03 15:02:13 -0700
commit273464d5a1369a784eebeebaa4a4f8b4371b7699 (patch)
treee45315b4ea8c5d8eab2a427302885377bc169e59 /src
parenta496684019497395b71c6d460501197a74e21e0e (diff)
parentaa1f8aeeea1c27fe88270cc8b5df970d9f292385 (diff)
downloadpackages_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
Diffstat (limited to 'src')
-rw-r--r--src/com/android/settings/PrivacySettings.java4
1 files changed, 2 insertions, 2 deletions
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