From ba62229b3cd0cacb1dad8b6b0bb1706aeb1e84db Mon Sep 17 00:00:00 2001
From: Doris Ling <dling@google.com>
Date: Wed, 16 May 2018 16:10:21 -0700
Subject: [PATCH] Add resource for Backup summary.

- currently, the backup summary is using the accessibility summary
resource. In Spanish, the summary needs to be gender specific. Create
its own resource string so that it can be translated into correct
gender.

Change-Id: Iae14d7d3fc342264c5c8bff6bdfca0849bb4ba93
Fixes: 78477107
Test: make RunSettingsRoboTests
---
 res/values/strings.xml                                        | 4 ++++
 .../backup/BackupSettingsActivityPreferenceController.java    | 4 ++--
 .../BackupSettingsActivityPreferenceControllerTest.java       | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4e415723378..12218e63c39 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5637,6 +5637,10 @@
     <!-- Backup and reset Settings screen --><skip />
     <!-- Backup and reset settings menu and activity title -->
     <string name="privacy_settings_title">Backup</string>
+    <!-- Summary for the Backup settings when it is turned on. -->
+    <string name="backup_summary_state_on">On</string>
+    <!-- Summary for the Backup settings when it is turned off. -->
+    <string name="backup_summary_state_off">Off</string>
     <!-- Backup section title -->
     <string name="backup_section_title">Backup &amp; restore</string>
     <!-- Personal data section title -->
diff --git a/src/com/android/settings/backup/BackupSettingsActivityPreferenceController.java b/src/com/android/settings/backup/BackupSettingsActivityPreferenceController.java
index f0439d6d0a0..4a99f5abed6 100644
--- a/src/com/android/settings/backup/BackupSettingsActivityPreferenceController.java
+++ b/src/com/android/settings/backup/BackupSettingsActivityPreferenceController.java
@@ -49,7 +49,7 @@ public class BackupSettingsActivityPreferenceController extends BasePreferenceCo
         final boolean backupEnabled = mBackupManager.isBackupEnabled();
 
         return backupEnabled
-                ? mContext.getText(R.string.accessibility_feature_state_on)
-                : mContext.getText(R.string.accessibility_feature_state_off);
+                ? mContext.getText(R.string.backup_summary_state_on)
+                : mContext.getText(R.string.backup_summary_state_off);
     }
 }
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java
index ee05740c0ca..5a360cb0daf 100644
--- a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java
@@ -70,7 +70,7 @@ public class BackupSettingsActivityPreferenceControllerTest {
         mBackupEnabled = true;
 
         mController.updateState(mBackupPreference);
-        String summaryString = mContext.getString(R.string.accessibility_feature_state_on);
+        String summaryString = mContext.getString(R.string.backup_summary_state_on);
         verify(mBackupPreference).setSummary(summaryString);
     }
 
@@ -79,7 +79,7 @@ public class BackupSettingsActivityPreferenceControllerTest {
         mBackupEnabled = false;
 
         mController.updateState(mBackupPreference);
-        String summaryString = mContext.getString(R.string.accessibility_feature_state_off);
+        String summaryString = mContext.getString(R.string.backup_summary_state_off);
         verify(mBackupPreference).setSummary(summaryString);
     }