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

am 273464d5: am aa1f8aee: Clarify backup setting

Browse Source 
Merge commit '273464d5a1369a784eebeebaa4a4f8b4371b7699' into kraken

* commit '273464d5a1369a784eebeebaa4a4f8b4371b7699':
  Clarify backup setting
This commit is contained in:
Kenny Root
2010-06-03 15:07:14 -07:00
committed by Android Git Automerger
parent ca61c25578 273464d5a1
commit a262b5d1a0
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
res/values/strings.xml
View File

@@ -2502,15 +2502,17 @@ found in the list of installed applications.</string>
<!-- Privacy settings activity title --> <!-- Privacy settings activity title -->
<string name="privacy_settings_title">Privacy settings</string> <string name="privacy_settings_title">Privacy settings</string>
<!-- Backup section title --> <!-- Backup section title -->
<string name="backup_section_title">Backup and Restore</string> <string name="backup_section_title">Backup and restore</string>
<!-- Personal data section title --> <!-- Personal data section title -->
<string name="personal_data_section_title">Personal data</string> <string name="personal_data_section_title">Personal data</string>
<!-- Backup settings menu title --> <!-- Backup data menu title -->
<string name="backup_settings_title">Back up my settings</string> <string name="backup_data_title">Back up data</string>
<!-- Summary text of the "back up data" setting -->
<string name="backup_data_summary">Back up settings and other application data.</string>
<!-- Auto-restore menu title --> <!-- Auto-restore menu title -->
<string name="auto_restore_title">Automatic restore</string> <string name="auto_restore_title">Automatic restore</string>
<!-- Summary text of the "automatic restore" setting --> <!-- Summary text of the "automatic restore" setting -->
<string name="auto_restore_summary">Restore applications\' data from backup when they are installed</string> <string name="auto_restore_summary">If I reinstall an application, restore backed up settings or other data.</string>
<!-- Dialog title for confirmation to erase backup data from server --> <!-- Dialog title for confirmation to erase backup data from server -->
<string name="backup_erase_dialog_title">Backup</string> <string name="backup_erase_dialog_title">Backup</string>
<!-- Dialog title for confirmation to erase backup data from server --> <!-- Dialog title for confirmation to erase backup data from server -->

5
res/xml/privacy_settings.xml
View File

@@ -20,8 +20,9 @@
android:title="@string/backup_section_title"> android:title="@string/backup_section_title">
<!-- Backup settings --> <!-- Backup settings -->
<CheckBoxPreference <CheckBoxPreference
android:key="backup_settings" android:key="backup_data"
android:title="@string/backup_settings_title" android:title="@string/backup_data_title"
android:summary="@string/backup_data_summary"
android:persistent="false" /> android:persistent="false" />
<CheckBoxPreference <CheckBoxPreference
android:key="auto_restore" android:key="auto_restore"

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

@@ -44,7 +44,7 @@ public class PrivacySettings extends PreferenceActivity implements
// Vendor specific // Vendor specific
private static final String GSETTINGS_PROVIDER = "com.google.settings"; private static final String GSETTINGS_PROVIDER = "com.google.settings";
private static final String BACKUP_CATEGORY = "backup_category"; private static final String BACKUP_CATEGORY = "backup_category";
private static final String BACKUP_SETTINGS = "backup_settings"; private static final String BACKUP_DATA = "backup_data";
private static final String AUTO_RESTORE = "auto_restore"; private static final String AUTO_RESTORE = "auto_restore";
private CheckBoxPreference mBackup; private CheckBoxPreference mBackup;
private CheckBoxPreference mAutoRestore; private CheckBoxPreference mAutoRestore;
@@ -59,7 +59,7 @@ public class PrivacySettings extends PreferenceActivity implements
addPreferencesFromResource(R.xml.privacy_settings); addPreferencesFromResource(R.xml.privacy_settings);
final PreferenceScreen screen = getPreferenceScreen(); final PreferenceScreen screen = getPreferenceScreen();
mBackup = (CheckBoxPreference) screen.findPreference(BACKUP_SETTINGS); mBackup = (CheckBoxPreference) screen.findPreference(BACKUP_DATA);
mAutoRestore = (CheckBoxPreference) screen.findPreference(AUTO_RESTORE); mAutoRestore = (CheckBoxPreference) screen.findPreference(AUTO_RESTORE);
// Vendor specific // Vendor specific