summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2010-06-03 15:07:14 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-06-03 15:07:14 -0700
commita262b5d1a07ab2765885d7e379a0de8787ccb672 (patch)
tree263a885ddb473e7049bd33acd572e5b0972ba1e0 /src
parentca61c255785b2b6be8ec6cbdd096843c0539bc42 (diff)
parent273464d5a1369a784eebeebaa4a4f8b4371b7699 (diff)
downloadpackages_apps_Settings-a262b5d1a07ab2765885d7e379a0de8787ccb672.zip
packages_apps_Settings-a262b5d1a07ab2765885d7e379a0de8787ccb672.tar.gz
packages_apps_Settings-a262b5d1a07ab2765885d7e379a0de8787ccb672.tar.bz2
am 273464d5: am aa1f8aee: Clarify backup setting
Merge commit '273464d5a1369a784eebeebaa4a4f8b4371b7699' into kraken * commit '273464d5a1369a784eebeebaa4a4f8b4371b7699': 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