Merge "Remove backup preferences if backup service is inactive" into lmp-mr1-dev (5875aefa) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -4384,6 +4384,10 @@
		<string name="auto_restore_title">Automatic restore</string>
		<!-- Summary text of the "automatic restore" setting -->
		<string name="auto_restore_summary">When reinstalling an app, restore backed up settings and data</string>
		<!-- Title of the preference informing the user about the backup service being inactive [CHAR LIMIT=50]-->
		<string name="backup_inactive_title">Backup service is inactive.</string>
		<!-- Summary text of the preference informing the user about the backup service being inactive, explaining that this is likely set by device policy [CHAR LIMIT=150]-->
		<string name="backup_inactive_summary">This is set by your device policy.</string>

		<!-- Local (desktop) backup password menu title [CHAR LIMIT=25] -->
		<string name="local_backup_password_title">Desktop backup password</string>

res/xml/privacy_settings.xml

+8 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,14 @@
		android:summary="@string/auto_restore_summary"
		android:persistent="false" />

		<Preference
		android:key="backup_inactive"
		android:title="@string/backup_inactive_title"
		android:summary="@string/backup_inactive_summary"
		android:persistent="false"
		android:enabled="false"
		android:selectable="false" />

		</PreferenceCategory>

		<PreferenceCategory android:key="personal_data_category"

src/com/android/settings/PrivacySettings.java

+55 −9

Original line number	Diff line number	Diff line
		@@ -30,11 +30,13 @@ import android.os.ServiceManager;
		import android.os.UserHandle;
		import android.os.UserManager;
		import android.preference.Preference;
		import android.preference.PreferenceCategory;
		import android.preference.Preference.OnPreferenceChangeListener;
		import android.preference.PreferenceScreen;
		import android.preference.SwitchPreference;
		import android.provider.SearchIndexableResource;
		import android.provider.Settings;
		import android.util.Log;

		import com.android.settings.search.BaseSearchIndexProvider;
		import com.android.settings.search.Indexable;
		@@ -55,7 +57,9 @@ public class PrivacySettings extends SettingsPreferenceFragment implements
		private static final String BACKUP_DATA = "backup_data";
		private static final String AUTO_RESTORE = "auto_restore";
		private static final String CONFIGURE_ACCOUNT = "configure_account";
		private static final String BACKUP_INACTIVE = "backup_inactive";
		private static final String PERSONAL_DATA_CATEGORY = "personal_data_category";
		private static final String TAG = "PrivacySettings";
		private IBackupManager mBackupManager;
		private SwitchPreference mBackup;
		private SwitchPreference mAutoRestore;
		@@ -88,15 +92,23 @@ public class PrivacySettings extends SettingsPreferenceFragment implements

		mConfigure = (PreferenceScreen) screen.findPreference(CONFIGURE_ACCOUNT);

		if (UserManager.get(getActivity()).hasUserRestriction(
		UserManager.DISALLOW_FACTORY_RESET)) {
		screen.removePreference(findPreference(PERSONAL_DATA_CATEGORY));
		ArrayList<String> keysToRemove = getNonVisibleKeys(getActivity());
		final int screenPreferenceCount = screen.getPreferenceCount();
		for (int i = screenPreferenceCount - 1; i >= 0; --i) {
		Preference preference = screen.getPreference(i);
		if (keysToRemove.contains(preference.getKey())) {
		screen.removePreference(preference);
		}
		}
		PreferenceCategory backupCategory = (PreferenceCategory) findPreference(BACKUP_CATEGORY);
		if (backupCategory != null) {
		final int backupCategoryPreferenceCount = backupCategory.getPreferenceCount();
		for (int i = backupCategoryPreferenceCount - 1; i >= 0; --i) {
		Preference preference = backupCategory.getPreference(i);
		if (keysToRemove.contains(preference.getKey())) {
		backupCategory.removePreference(preference);
		}
		}

		// Vendor specific
		if (getActivity().getPackageManager().
		resolveContentProvider(GSETTINGS_PROVIDER, 0) == null) {
		screen.removePreference(findPreference(BACKUP_CATEGORY));
		}
		updateToggles();
		}
		@@ -285,6 +297,40 @@ public class PrivacySettings extends SettingsPreferenceFragment implements

		return result;
		}

		@Override
		public List<String> getNonIndexableKeys(Context context) {
		return getNonVisibleKeys(context);
		}
		}

		private static ArrayList<String> getNonVisibleKeys(Context context) {
		final ArrayList<String> nonVisibleKeys = new ArrayList<String>();
		final IBackupManager backupManager = IBackupManager.Stub.asInterface(
		ServiceManager.getService(Context.BACKUP_SERVICE));
		boolean isServiceActive = false;
		try {
		isServiceActive = backupManager.isBackupServiceActive(UserHandle.myUserId());
		} catch (RemoteException e) {
		Log.w(TAG, "Failed querying backup manager service activity status. " +
		"Assuming it is inactive.");
		}
		if (isServiceActive) {
		nonVisibleKeys.add(BACKUP_INACTIVE);
		} else {
		nonVisibleKeys.add(AUTO_RESTORE);
		nonVisibleKeys.add(CONFIGURE_ACCOUNT);
		nonVisibleKeys.add(BACKUP_DATA);
		}
		if (UserManager.get(context).hasUserRestriction(
		UserManager.DISALLOW_FACTORY_RESET)) {
		nonVisibleKeys.add(PERSONAL_DATA_CATEGORY);
		}
		// Vendor specific
		if (context.getPackageManager().
		resolveContentProvider(GSETTINGS_PROVIDER, 0) == null) {
		nonVisibleKeys.add(BACKUP_CATEGORY);
		}
		return nonVisibleKeys;
		}
		}