From 1ad1c4b82a6ee1379cdd2f53b313a57972904feb Mon Sep 17 00:00:00 2001 From: Nihar Thakkar Date: Wed, 12 Jun 2019 19:33:06 +0000 Subject: [PATCH 1/6] Disable "Backup & reset" preference --- src/com/android/settings/SettingsActivity.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index 813253d831c..8c201dd045a 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -703,8 +703,9 @@ public class SettingsActivity extends SettingsDrawerActivity || somethingChanged; // Enable/disable backup settings depending on whether the user is admin. + // /e/ Do NOT display Backup & reset item for the moment. somethingChanged = setTileEnabled(changedList, new ComponentName(packageName, - BackupSettingsActivity.class.getName()), true, isAdmin) + BackupSettingsActivity.class.getName()), true, false) || somethingChanged; somethingChanged = setTileEnabled(changedList, new ComponentName(packageName, -- GitLab From 9773d4093794801366f4341e1815c17f6e54cb7a Mon Sep 17 00:00:00 2001 From: Nihar Thakkar Date: Wed, 12 Jun 2019 19:36:48 +0000 Subject: [PATCH 2/6] Disable "Backup & reset" preference --- src/com/android/settings/PrivacySettings.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/PrivacySettings.java b/src/com/android/settings/PrivacySettings.java index 24774e06576..3ed4b6bd077 100644 --- a/src/com/android/settings/PrivacySettings.java +++ b/src/com/android/settings/PrivacySettings.java @@ -81,7 +81,8 @@ public class PrivacySettings extends SettingsPreferenceFragment { super.onCreate(savedInstanceState); // Don't allow any access if this is not an admin user. // TODO: backup/restore currently only works with owner user b/22760572 - mEnabled = UserManager.get(getActivity()).isAdminUser(); + // /e/ Do NOT display Backup & reset item for the moment. + mEnabled = false; if (!mEnabled) { return; } -- GitLab From 38930c5d373e88587bfc9b2ef66f1c6b9ae28237 Mon Sep 17 00:00:00 2001 From: Nihar Thakkar Date: Wed, 12 Jun 2019 19:37:19 +0000 Subject: [PATCH 3/6] Add copyright --- src/com/android/settings/PrivacySettings.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/com/android/settings/PrivacySettings.java b/src/com/android/settings/PrivacySettings.java index 3ed4b6bd077..5c60cfc706d 100644 --- a/src/com/android/settings/PrivacySettings.java +++ b/src/com/android/settings/PrivacySettings.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2009 The Android Open Source Project + * Copyright (C) 2018 e.foundation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. -- GitLab From d06ae8dcdd260e9f1c026d92834894bb61b71cfd Mon Sep 17 00:00:00 2001 From: Nihar Thakkar Date: Wed, 12 Jun 2019 19:38:01 +0000 Subject: [PATCH 4/6] Add copyright --- src/com/android/settings/SettingsActivity.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index 8c201dd045a..0e0c72b7e5e 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -1,5 +1,6 @@ /* * Copyright (C) 2014 The Android Open Source Project + * Copyright (C) 2019 e.foundation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. -- GitLab From 4362696e946bf64418066bd2eb369815eef49556 Mon Sep 17 00:00:00 2001 From: Nihar Thakkar Date: Wed, 12 Jun 2019 19:38:22 +0000 Subject: [PATCH 5/6] Update PrivacySettings.java --- src/com/android/settings/PrivacySettings.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/settings/PrivacySettings.java b/src/com/android/settings/PrivacySettings.java index 5c60cfc706d..cd83368cf42 100644 --- a/src/com/android/settings/PrivacySettings.java +++ b/src/com/android/settings/PrivacySettings.java @@ -1,6 +1,6 @@ /* * Copyright (C) 2009 The Android Open Source Project - * Copyright (C) 2018 e.foundation + * Copyright (C) 2019 e.foundation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. -- GitLab From 9dac1c63d2d1dd6b1d7d8e0191b4f466d87b8d8d Mon Sep 17 00:00:00 2001 From: Nihar Thakkar Date: Fri, 28 Jun 2019 03:30:47 +0000 Subject: [PATCH 6/6] Don't show backup preference --- res/xml/system_dashboard_fragment.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/res/xml/system_dashboard_fragment.xml b/res/xml/system_dashboard_fragment.xml index 1ca86ab1ebf..15a2eb51a8b 100644 --- a/res/xml/system_dashboard_fragment.xml +++ b/res/xml/system_dashboard_fragment.xml @@ -1,5 +1,6 @@ - - + -->