diff --git a/res/xml/privacy_settings.xml b/res/xml/privacy_settings.xml index f2af8f3fcbd8cf59149e19208c5a88b3118a1da4..75ce5f998908fcbca3453d0c94fae4d3f3a3e2de 100644 --- a/res/xml/privacy_settings.xml +++ b/res/xml/privacy_settings.xml @@ -19,6 +19,7 @@ android:title="@string/privacy_settings_title"> + + keysToRemove = new HashSet<>(); getNonVisibleKeys(getActivity(), keysToRemove); @@ -111,7 +110,7 @@ public class PrivacySettings extends SettingsPreferenceFragment implements Index } } - updateToggles(); + //updateToggles(); } @Override @@ -119,9 +118,9 @@ public class PrivacySettings extends SettingsPreferenceFragment implements Index super.onResume(); // Refresh UI - if (mEnabled) { + /* if (mEnabled) { updateToggles(); - } + }*/ } private OnPreferenceChangeListener preferenceChangeListener = new OnPreferenceChangeListener() { @@ -132,14 +131,14 @@ public class PrivacySettings extends SettingsPreferenceFragment implements Index } boolean nextValue = (Boolean) newValue; boolean result = false; - if (preference == mAutoRestore) { + /*if (preference == mAutoRestore) { try { mBackupManager.setAutoRestore(nextValue); result = true; } catch (RemoteException e) { mAutoRestore.setChecked(!nextValue); } - } + }*/ return result; } }; @@ -265,7 +264,7 @@ public class PrivacySettings extends SettingsPreferenceFragment implements Index } private static void getNonVisibleKeys(Context context, Collection nonVisibleKeys) { - final IBackupManager backupManager = IBackupManager.Stub.asInterface( + /*final IBackupManager backupManager = IBackupManager.Stub.asInterface( ServiceManager.getService(Context.BACKUP_SERVICE)); boolean isServiceActive = false; try { @@ -273,17 +272,17 @@ public class PrivacySettings extends SettingsPreferenceFragment implements Index } catch (RemoteException e) { Log.w(TAG, "Failed querying backup manager service activity status. " + "Assuming it is inactive."); - } + }*/ boolean vendorSpecific = context.getPackageManager(). resolveContentProvider(GSETTINGS_PROVIDER, 0) == null; - if (vendorSpecific || isServiceActive) { + /*if (vendorSpecific || isServiceActive) { nonVisibleKeys.add(BACKUP_INACTIVE); } if (vendorSpecific || !isServiceActive) { nonVisibleKeys.add(BACKUP_DATA); nonVisibleKeys.add(AUTO_RESTORE); nonVisibleKeys.add(CONFIGURE_ACCOUNT); - } + }*/ if (RestrictedLockUtils.hasBaseUserRestriction(context, UserManager.DISALLOW_FACTORY_RESET, UserHandle.myUserId())) { nonVisibleKeys.add(FACTORY_RESET); diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index b83f6f9c956f1713793d5e7a4c03cab08301eabe..b5a6955b6f9ef416290dc1bb3cebf6759898ada0 100755 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -1175,7 +1175,7 @@ public class SettingsActivity extends SettingsDrawerActivity boolean useDefaultBackup = TextUtils.isEmpty(backupIntent); // /e/ Do NOT display Backup & reset item for the moment. - useDefaultBackup = false; + //useDefaultBackup = false; setTileEnabled(new ComponentName(packageName, Settings.PrivacySettingsActivity.class.getName()), useDefaultBackup, isAdmin, pm); boolean hasBackupActivity = false;