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

Tweak Privacy settings to match latest mocks

Browse Source 
"Configure backup" => "Backup account" etc.

Bug 3293714

Change-Id: I1c3a3729e0198c5148496a846ab035d4daddc214
This commit is contained in:
Christopher Tate
2010-12-16 17:25:46 -08:00
parent 22c4b39e06
commit 58e62926b9
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/values/strings.xml
View File

@@ -2873,10 +2873,10 @@ found in the list of installed applications.</string>
<string name="backup_data_title">Back up my data</string> <string name="backup_data_title">Back up my data</string>
<!-- Summary text of the "back up data" setting --> <!-- Summary text of the "back up data" setting -->
<string name="backup_data_summary">Back up application data, Wi-Fi passwords, and other settings to Google servers</string> <string name="backup_data_summary">Back up application data, Wi-Fi passwords, and other settings to Google servers</string>
<!-- Configure backup options menu title [CHAR LIMIT=25]--> <!-- Configure backup account options menu title [CHAR LIMIT=25]-->
<string name="backup_configure_transport_title">Configure backup</string> <string name="backup_configure_account_title">Backup account</string>
<!-- Default summary text of the "Configure backup" setting [CHAR LIMIT=80]--> <!-- Default summary text of the "Configure backup account" setting [CHAR LIMIT=80]-->
<string name="backup_configure_transport_default_summary">No backup destination is available.</string> <string name="backup_configure_account_default_summary">No account is currently storing backed up 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 -->

10
res/xml/privacy_settings.xml
View File

@@ -26,11 +26,11 @@
android:summary="@string/backup_data_summary" android:summary="@string/backup_data_summary"
android:persistent="false" /> android:persistent="false" />
<PreferenceScreen <PreferenceScreen
android:key="configure_transport" android:key="configure_account"
android:dependency="backup_data" android:title="@string/backup_configure_account_title"
android:layout="?android:attr/preferenceLayoutChild" android:summary="@string/backup_configure_account_default_summary"
android:title="@string/backup_configure_transport_title" android:persistent="false">
android:summary="@string/backup_configure_transport_default_summary"> <!-- the Intent declared here is always overwritten by a real one -->
<intent android:action="dummy" /> <intent android:action="dummy" />
</PreferenceScreen> </PreferenceScreen>
<CheckBoxPreference <CheckBoxPreference

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

@@ -42,7 +42,7 @@ public class PrivacySettings extends SettingsPreferenceFragment implements
private static final String BACKUP_CATEGORY = "backup_category"; private static final String BACKUP_CATEGORY = "backup_category";
private static final String BACKUP_DATA = "backup_data"; 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 static final String CONFIGURE_TRANSPORT = "configure_transport"; private static final String CONFIGURE_ACCOUNT = "configure_account";
private IBackupManager mBackupManager; private IBackupManager mBackupManager;
private CheckBoxPreference mBackup; private CheckBoxPreference mBackup;
private CheckBoxPreference mAutoRestore; private CheckBoxPreference mAutoRestore;
@@ -63,7 +63,7 @@ public class PrivacySettings extends SettingsPreferenceFragment implements
mBackup = (CheckBoxPreference) screen.findPreference(BACKUP_DATA); mBackup = (CheckBoxPreference) screen.findPreference(BACKUP_DATA);
mAutoRestore = (CheckBoxPreference) screen.findPreference(AUTO_RESTORE); mAutoRestore = (CheckBoxPreference) screen.findPreference(AUTO_RESTORE);
mConfigure = (PreferenceScreen) screen.findPreference(CONFIGURE_TRANSPORT); mConfigure = (PreferenceScreen) screen.findPreference(CONFIGURE_ACCOUNT);
// Vendor specific // Vendor specific
if (getActivity().getPackageManager(). if (getActivity().getPackageManager().
@@ -152,7 +152,7 @@ public class PrivacySettings extends SettingsPreferenceFragment implements
if (configSummary != null) { if (configSummary != null) {
mConfigure.setSummary(configSummary); mConfigure.setSummary(configSummary);
} else { } else {
mConfigure.setSummary(R.string.backup_configure_transport_default_summary); mConfigure.setSummary(R.string.backup_configure_account_default_summary);
} }
} }