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

Merge "Add resource for Backup summary."

Browse Source
This commit is contained in:
Doris Ling
2018-05-17 17:27:46 +00:00
committed by Android (Google) Code Review
parent 4050d35c9f ba62229b3c
commit 431a506a8f
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

@@ -5635,6 +5635,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);
} }