From 58e62926b9ceca72275b657b2fa7b9e54fc1a931 Mon Sep 17 00:00:00 2001
From: Christopher Tate <ctate@google.com>
Date: Thu, 16 Dec 2010 17:25:46 -0800
Subject: [PATCH] Tweak Privacy settings to match latest mocks

"Configure backup" => "Backup account" etc.

Bug 3293714

Change-Id: I1c3a3729e0198c5148496a846ab035d4daddc214
---
 res/values/strings.xml                        |  8 ++++----
 res/xml/privacy_settings.xml                  | 10 +++++-----
 src/com/android/settings/PrivacySettings.java |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 047aa0c30d4..a3a909fce7b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2873,10 +2873,10 @@ found in the list of installed applications.</string>
     <string name="backup_data_title">Back up my data</string>
     <!-- Summary text of the "back up data" setting -->
     <string name="backup_data_summary">Back up application data, Wi-Fi passwords, and other settings to Google servers</string>
-    <!-- Configure backup options menu title [CHAR LIMIT=25]-->
-    <string name="backup_configure_transport_title">Configure backup</string>
-    <!-- Default summary text of the "Configure backup" setting [CHAR LIMIT=80]-->
-    <string name="backup_configure_transport_default_summary">No backup destination is available.</string>
+    <!-- Configure backup account options menu title [CHAR LIMIT=25]-->
+    <string name="backup_configure_account_title">Backup account</string>
+    <!-- Default summary text of the "Configure backup account" setting [CHAR LIMIT=80]-->
+    <string name="backup_configure_account_default_summary">No account is currently storing backed up data</string>
     <!-- Auto-restore menu title -->
     <string name="auto_restore_title">Automatic restore</string>
     <!-- Summary text of the "automatic restore" setting -->
diff --git a/res/xml/privacy_settings.xml b/res/xml/privacy_settings.xml
index c28dbc1901e..54d88f7eeef 100644
--- a/res/xml/privacy_settings.xml
+++ b/res/xml/privacy_settings.xml
@@ -26,11 +26,11 @@
                 android:summary="@string/backup_data_summary"
                 android:persistent="false" />
         <PreferenceScreen
-                android:key="configure_transport"
-                android:dependency="backup_data"
-                android:layout="?android:attr/preferenceLayoutChild"
-                android:title="@string/backup_configure_transport_title"
-                android:summary="@string/backup_configure_transport_default_summary">
+                android:key="configure_account"
+                android:title="@string/backup_configure_account_title"
+                android:summary="@string/backup_configure_account_default_summary"
+                android:persistent="false">
+            <!-- the Intent declared here is always overwritten by a real one -->
             <intent android:action="dummy" />
         </PreferenceScreen>
         <CheckBoxPreference
diff --git a/src/com/android/settings/PrivacySettings.java b/src/com/android/settings/PrivacySettings.java
index 4132507005d..9ada710069e 100644
--- a/src/com/android/settings/PrivacySettings.java
+++ b/src/com/android/settings/PrivacySettings.java
@@ -42,7 +42,7 @@ public class PrivacySettings extends SettingsPreferenceFragment implements
     private static final String BACKUP_CATEGORY = "backup_category";
     private static final String BACKUP_DATA = "backup_data";
     private static final String AUTO_RESTORE = "auto_restore";
-    private static final String CONFIGURE_TRANSPORT = "configure_transport";
+    private static final String CONFIGURE_ACCOUNT = "configure_account";
     private IBackupManager mBackupManager;
     private CheckBoxPreference mBackup;
     private CheckBoxPreference mAutoRestore;
@@ -63,7 +63,7 @@ public class PrivacySettings extends SettingsPreferenceFragment implements
 
         mBackup = (CheckBoxPreference) screen.findPreference(BACKUP_DATA);
         mAutoRestore = (CheckBoxPreference) screen.findPreference(AUTO_RESTORE);
-        mConfigure = (PreferenceScreen) screen.findPreference(CONFIGURE_TRANSPORT);
+        mConfigure = (PreferenceScreen) screen.findPreference(CONFIGURE_ACCOUNT);
 
         // Vendor specific
         if (getActivity().getPackageManager().
@@ -152,7 +152,7 @@ public class PrivacySettings extends SettingsPreferenceFragment implements
         if (configSummary != null) {
             mConfigure.setSummary(configSummary);
         } else {
-            mConfigure.setSummary(R.string.backup_configure_transport_default_summary);
+            mConfigure.setSummary(R.string.backup_configure_account_default_summary);
         }
     }