Merge "Always show backup settings (even if backup is deactivated)." into qt-dev
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 8077ee3..5f2e1a9 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -639,9 +639,8 @@
showDev, isAdmin)
|| somethingChanged;
- boolean enableBackupTile = new BackupSettingsHelper(this).showBackupSettingsForUser();
somethingChanged = setTileEnabled(changedList, new ComponentName(packageName,
- UserBackupSettingsActivity.class.getName()), enableBackupTile, isAdmin)
+ UserBackupSettingsActivity.class.getName()), true, isAdmin)
|| somethingChanged;
somethingChanged = setTileEnabled(changedList, new ComponentName(packageName,
diff --git a/src/com/android/settings/backup/BackupInactivePreferenceController.java b/src/com/android/settings/backup/BackupInactivePreferenceController.java
index 92a9487..86e1220 100644
--- a/src/com/android/settings/backup/BackupInactivePreferenceController.java
+++ b/src/com/android/settings/backup/BackupInactivePreferenceController.java
@@ -28,7 +28,7 @@
@Override
public int getAvailabilityStatus() {
- if (!new BackupSettingsHelper(mContext).showBackupSettingsForUser()) {
+ if (!new BackupSettingsHelper(mContext).isBackupServiceActive()) {
return AVAILABLE_UNSEARCHABLE;
}
if (PrivacySettingsUtils.isInvisibleKey(mContext, PrivacySettingsUtils.BACKUP_INACTIVE)) {
diff --git a/src/com/android/settings/backup/BackupSettingsHelper.java b/src/com/android/settings/backup/BackupSettingsHelper.java
index ff4b0b5..1d3455b 100644
--- a/src/com/android/settings/backup/BackupSettingsHelper.java
+++ b/src/com/android/settings/backup/BackupSettingsHelper.java
@@ -50,14 +50,6 @@
mContext = context;
}
- public boolean showBackupSettingsForUser() {
- // For profiles, we want them to be included in the profile select dialog even if
- // backup is not activated.
- // For other users, enable/disable backup settings depending on whether backup is activated
- // for the user.
- return UserManager.get(mContext).isManagedProfile() || isBackupServiceActive();
- }
-
/**
* If there is only one profile, show whether the backup is on or off.
* Otherwise, show nothing.
diff --git a/src/com/android/settings/backup/UserBackupSettingsActivity.java b/src/com/android/settings/backup/UserBackupSettingsActivity.java
index dbbb135..c2bcd07 100644
--- a/src/com/android/settings/backup/UserBackupSettingsActivity.java
+++ b/src/com/android/settings/backup/UserBackupSettingsActivity.java
@@ -123,7 +123,7 @@
@Override
public List<String> getNonIndexableKeys(Context context) {
final List<String> keys = super.getNonIndexableKeys(context);
- if (!new BackupSettingsHelper(context).showBackupSettingsForUser()) {
+ if (!new BackupSettingsHelper(context).isBackupServiceActive()) {
keys.add(BACKUP_SEARCH_INDEX_KEY);
}
return keys;
diff --git a/tests/robotests/src/com/android/settings/backup/BackupInactivePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupInactivePreferenceControllerTest.java
index 669aabb..e9c0469 100644
--- a/tests/robotests/src/com/android/settings/backup/BackupInactivePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/backup/BackupInactivePreferenceControllerTest.java
@@ -54,18 +54,18 @@
}
@Test
- public void getAvailabilityStatus_isnotInvisibleKey_showBackup_shouldBeAvailable() {
+ public void getAvailabilityStatus_isnotInvisibleKey_backupActive_shouldBeAvailable() {
ShadowPrivacySettingsUtils.setIsInvisibleKey(false);
- ShadowBackupSettingsHelper.showBackupSettingsForUser = true;
+ ShadowBackupSettingsHelper.isBackupServiceActive = true;
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.AVAILABLE);
}
@Test
- public void getAvailabilityStatus_isnotInvisibleKey_dontShowBackup_shouldBeUnsearchable() {
+ public void getAvailabilityStatus_isnotInvisibleKey_backupNotActive_shouldBeUnsearchable() {
ShadowPrivacySettingsUtils.setIsInvisibleKey(false);
- ShadowBackupSettingsHelper.showBackupSettingsForUser = false;
+ ShadowBackupSettingsHelper.isBackupServiceActive = false;
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.AVAILABLE_UNSEARCHABLE);
@@ -74,7 +74,7 @@
@Test
public void getAvailabilityStatus_isInvisibleKey_shouldBeDisabledUnsupported() {
ShadowPrivacySettingsUtils.setIsInvisibleKey(true);
- ShadowBackupSettingsHelper.showBackupSettingsForUser = true;
+ ShadowBackupSettingsHelper.isBackupServiceActive = true;
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
diff --git a/tests/robotests/src/com/android/settings/backup/UserBackupSettingsActivityTest.java b/tests/robotests/src/com/android/settings/backup/UserBackupSettingsActivityTest.java
index 9c5a11a..7e703a6 100644
--- a/tests/robotests/src/com/android/settings/backup/UserBackupSettingsActivityTest.java
+++ b/tests/robotests/src/com/android/settings/backup/UserBackupSettingsActivityTest.java
@@ -123,8 +123,8 @@
}
@Test
- public void getNonIndexableKeys_whenShowBackupSettings() {
- ShadowBackupSettingsHelper.showBackupSettingsForUser = true;
+ public void getNonIndexableKeys_whenBackupServiceActive() {
+ ShadowBackupSettingsHelper.isBackupServiceActive = true;
assertThat(UserBackupSettingsActivity.SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(
mApplication, true)).isNotEmpty();
@@ -133,8 +133,8 @@
}
@Test
- public void getNonIndexableKeys_whenDontShowBackupSettings() {
- ShadowBackupSettingsHelper.showBackupSettingsForUser = false;
+ public void getNonIndexableKeys_whenBackupServiceNotActive() {
+ ShadowBackupSettingsHelper.isBackupServiceActive = false;
assertThat(UserBackupSettingsActivity.SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(
mApplication, true)).isNotEmpty();
@@ -144,11 +144,11 @@
@Implements(BackupSettingsHelper.class)
public static class ShadowBackupSettingsHelper {
- static boolean showBackupSettingsForUser = true;
+ static boolean isBackupServiceActive = true;
@Implementation
- public boolean showBackupSettingsForUser() {
- return showBackupSettingsForUser;
+ public boolean isBackupServiceActive() {
+ return isBackupServiceActive;
}
@Implementation
@@ -163,7 +163,7 @@
@Resetter
public static void reset() {
- showBackupSettingsForUser = true;
+ isBackupServiceActive = true;
}
}
}