Merge "Always show backup settings (even if backup is deactivated)." into qt-dev (2f2a3c40) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/SettingsActivity.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -639,9 +639,8 @@ public class SettingsActivity extends SettingsBaseActivity
		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,

+1 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@ public class BackupInactivePreferenceController extends BasePreferenceController

		@Override
		public int getAvailabilityStatus() {
		if (!new BackupSettingsHelper(mContext).showBackupSettingsForUser()) {
		if (!new BackupSettingsHelper(mContext).isBackupServiceActive()) {
		return AVAILABLE_UNSEARCHABLE;
		}
		if (PrivacySettingsUtils.isInvisibleKey(mContext, PrivacySettingsUtils.BACKUP_INACTIVE)) {

+0 −8

Original line number	Diff line number	Diff line
		@@ -50,14 +50,6 @@ public class BackupSettingsHelper {
		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.

+1 −1

Original line number	Diff line number	Diff line
		@@ -123,7 +123,7 @@ public class UserBackupSettingsActivity extends FragmentActivity implements Inde
		@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;

+5 −5

Original line number	Diff line number	Diff line
		@@ -54,18 +54,18 @@ public class BackupInactivePreferenceControllerTest {
		}

		@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 @@ public class BackupInactivePreferenceControllerTest {
		@Test
		public void getAvailabilityStatus_isInvisibleKey_shouldBeDisabledUnsupported() {
		ShadowPrivacySettingsUtils.setIsInvisibleKey(true);
		ShadowBackupSettingsHelper.showBackupSettingsForUser = true;
		ShadowBackupSettingsHelper.isBackupServiceActive = true;

		assertThat(mController.getAvailabilityStatus())
		.isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);