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

am fcf64237: Merge "Re-add a string which was accidently removed." into mnc-dev

Browse Source 
* commit 'fcf64237b72b506d6f45717d8f7252fb656c5fa4':
  Re-add a string which was accidently removed.
This commit is contained in:
Stuart Scott
2015-06-04 01:03:15 +00:00
committed by Android Git Automerger
parent 91ec04bdce fcf64237b7
commit 01a6351f7a
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -4582,6 +4582,8 @@
<string name="auto_restore_summary">When reinstalling an app, restore backed up settings and data</string>
<!-- Title of the preference informing the user about the backup service being inactive [CHAR LIMIT=50]-->
<string name="backup_inactive_title">Backup service is inactive.</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>
<!-- Local (desktop) backup password menu title [CHAR LIMIT=25] -->
<string name="local_backup_password_title">Desktop backup password</string>

2
src/com/android/settings/PrivacySettings.java
View File

@@ -170,7 +170,7 @@ public class PrivacySettings extends SettingsPreferenceFragment implements Index
if (summary != null) {
mConfigure.setSummary(summary);
} else {
//mConfigure.setSummary(R.string.backup_configure_account_default_summary);
mConfigure.setSummary(R.string.backup_configure_account_default_summary);
}
}