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

Merge "Add "Manage backup data" item to "Backup & Reset" settings."

Browse Source
This commit is contained in:
Vladislav Kuzkokov
2016-01-26 11:05:05 +00:00
committed by Android (Google) Code Review
parent d40c11a7d5 ddb953fb73
commit 1b4e746a7f
2 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/xml/privacy_settings.xml
View File

@@ -33,6 +33,11 @@
<intent android:action="dummy" /> <intent android:action="dummy" />
</PreferenceScreen> </PreferenceScreen>
<PreferenceScreen
android:key="data_management"
android:persistent="false">
</PreferenceScreen>
<SwitchPreference <SwitchPreference
android:key="auto_restore" android:key="auto_restore"
android:title="@string/auto_restore_title" android:title="@string/auto_restore_title"

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

@@ -56,6 +56,7 @@ public class PrivacySettings extends SettingsPreferenceFragment implements Index
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_ACCOUNT = "configure_account"; private static final String CONFIGURE_ACCOUNT = "configure_account";
private static final String DATA_MANAGEMENT = "data_management";
private static final String BACKUP_INACTIVE = "backup_inactive"; private static final String BACKUP_INACTIVE = "backup_inactive";
private static final String NETWORK_RESET = "network_reset"; private static final String NETWORK_RESET = "network_reset";
private static final String FACTORY_RESET = "factory_reset"; private static final String FACTORY_RESET = "factory_reset";
@@ -64,6 +65,7 @@ public class PrivacySettings extends SettingsPreferenceFragment implements Index
private PreferenceScreen mBackup; private PreferenceScreen mBackup;
private SwitchPreference mAutoRestore; private SwitchPreference mAutoRestore;
private PreferenceScreen mConfigure; private PreferenceScreen mConfigure;
private PreferenceScreen mManageData;
private boolean mEnabled; private boolean mEnabled;
@Override @Override
@@ -92,6 +94,7 @@ public class PrivacySettings extends SettingsPreferenceFragment implements Index
mAutoRestore.setOnPreferenceChangeListener(preferenceChangeListener); mAutoRestore.setOnPreferenceChangeListener(preferenceChangeListener);
mConfigure = (PreferenceScreen) screen.findPreference(CONFIGURE_ACCOUNT); mConfigure = (PreferenceScreen) screen.findPreference(CONFIGURE_ACCOUNT);
mManageData = (PreferenceScreen) screen.findPreference(DATA_MANAGEMENT);
Set<String> keysToRemove = new HashSet<>(); Set<String> keysToRemove = new HashSet<>();
getNonVisibleKeys(getActivity(), keysToRemove); getNonVisibleKeys(getActivity(), keysToRemove);
@@ -146,11 +149,15 @@ public class PrivacySettings extends SettingsPreferenceFragment implements Index
boolean backupEnabled = false; boolean backupEnabled = false;
Intent configIntent = null; Intent configIntent = null;
String configSummary = null; String configSummary = null;
Intent manageIntent = null;
String manageLabel = null;
try { try {
backupEnabled = mBackupManager.isBackupEnabled(); backupEnabled = mBackupManager.isBackupEnabled();
String transport = mBackupManager.getCurrentTransport(); String transport = mBackupManager.getCurrentTransport();
configIntent = mBackupManager.getConfigurationIntent(transport); configIntent = mBackupManager.getConfigurationIntent(transport);
configSummary = mBackupManager.getDestinationString(transport); configSummary = mBackupManager.getDestinationString(transport);
manageIntent = mBackupManager.getDataManagementIntent(transport);
manageLabel = mBackupManager.getDataManagementLabel(transport);
mBackup.setSummary(backupEnabled mBackup.setSummary(backupEnabled
? R.string.accessibility_feature_state_on ? R.string.accessibility_feature_state_on
@@ -169,6 +176,17 @@ public class PrivacySettings extends SettingsPreferenceFragment implements Index
mConfigure.setIntent(configIntent); mConfigure.setIntent(configIntent);
setConfigureSummary(configSummary); setConfigureSummary(configSummary);
final boolean manageEnabled = (manageIntent != null) && backupEnabled;
if (manageEnabled) {
mManageData.setIntent(manageIntent);
if (manageLabel != null) {
mManageData.setTitle(manageLabel);
}
} else {
// Hide the item if data management intent is not supported by transport.
getPreferenceScreen().removePreference(mManageData);
}
RestrictedPreference networkResetPref = (RestrictedPreference) findPreference( RestrictedPreference networkResetPref = (RestrictedPreference) findPreference(
NETWORK_RESET); NETWORK_RESET);
if (networkResetPref != null) { if (networkResetPref != null) {