From be2370db13d77b1d33e1b07cdef87d5fa980ba86 Mon Sep 17 00:00:00 2001 From: Christine Franks Date: Mon, 27 Aug 2018 15:42:58 -0700 Subject: [PATCH] Remove demo restrictions These are now available as user restrictions. Bug: 113298946 Test: make RunSettingsRoboTests -j100 Change-Id: I637083c8edcf43b99cebbf5a7dfd60afee441ade --- src/com/android/settings/DateTimeSettings.java | 4 ---- src/com/android/settings/SettingsActivity.java | 10 ---------- 2 files changed, 14 deletions(-) diff --git a/src/com/android/settings/DateTimeSettings.java b/src/com/android/settings/DateTimeSettings.java index bf4299bc7c0..149deb15282 100644 --- a/src/com/android/settings/DateTimeSettings.java +++ b/src/com/android/settings/DateTimeSettings.java @@ -186,10 +186,6 @@ public class DateTimeSettings extends DashboardFragment implements public List getXmlResourcesToIndex( Context context, boolean enabled) { List result = new ArrayList<>(); - // Remove data/time settings from search in demo mode - if (UserManager.isDeviceInDemoMode(context)) { - return result; - } SearchIndexableResource sir = new SearchIndexableResource(context); sir.xmlResId = R.xml.date_time_prefs; diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index d268eb67d33..4ca1c2cb688 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -688,16 +688,6 @@ public class SettingsActivity extends SettingsBaseActivity && !Utils.isMonkeyRunning(), isAdmin) || somethingChanged; - somethingChanged = setTileEnabled(changedList, new ComponentName(packageName, - Settings.NetworkDashboardActivity.class.getName()), - !UserManager.isDeviceInDemoMode(this), isAdmin) - || somethingChanged; - - somethingChanged = setTileEnabled(changedList, new ComponentName(packageName, - Settings.DateTimeSettingsActivity.class.getName()), - !UserManager.isDeviceInDemoMode(this), isAdmin) - || somethingChanged; - final boolean showDev = DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(this) && !Utils.isMonkeyRunning(); somethingChanged = setTileEnabled(changedList, new ComponentName(packageName,