PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add resource for Backup summary.

Browse Source 
- 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
This commit is contained in:
Doris Ling
2018-05-16 16:10:21 -07:00
parent 579300b00c
commit ba62229b3c
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -5637,6 +5637,10 @@
<!-- Backup and reset Settings screen --><skip /> <!-- Backup and reset Settings screen --><skip />
<!-- Backup and reset settings menu and activity title --> <!-- Backup and reset settings menu and activity title -->
<string name="privacy_settings_title">Backup</string> <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 --> <!-- Backup section title -->
<string name="backup_section_title">Backup &amp; restore</string> <string name="backup_section_title">Backup &amp; restore</string>
<!-- Personal data section title --> <!-- Personal data section title -->

4
src/com/android/settings/backup/BackupSettingsActivityPreferenceController.java
View File

@@ -49,7 +49,7 @@ public class BackupSettingsActivityPreferenceController extends BasePreferenceCo
final boolean backupEnabled = mBackupManager.isBackupEnabled(); final boolean backupEnabled = mBackupManager.isBackupEnabled();
return backupEnabled return backupEnabled
? mContext.getText(R.string.accessibility_feature_state_on) ? mContext.getText(R.string.backup_summary_state_on)
: mContext.getText(R.string.accessibility_feature_state_off); : mContext.getText(R.string.backup_summary_state_off);
} }
} }

4
tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java
View File

@@ -70,7 +70,7 @@ public class BackupSettingsActivityPreferenceControllerTest {
mBackupEnabled = true; mBackupEnabled = true;
mController.updateState(mBackupPreference); 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); verify(mBackupPreference).setSummary(summaryString);
} }
@@ -79,7 +79,7 @@ public class BackupSettingsActivityPreferenceControllerTest {
mBackupEnabled = false; mBackupEnabled = false;
mController.updateState(mBackupPreference); 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); verify(mBackupPreference).setSummary(summaryString);
} }