PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove demo restrictions"

Browse Source
This commit is contained in:
Christine Franks
2018-08-28 15:45:35 +00:00
committed by Android (Google) Code Review
parent d83c1b92d2 be2370db13
commit 036ca19897
2 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/DateTimeSettings.java
View File

@@ -186,10 +186,6 @@ public class DateTimeSettings extends DashboardFragment implements
public List<SearchIndexableResource> getXmlResourcesToIndex( public List<SearchIndexableResource> getXmlResourcesToIndex(
Context context, boolean enabled) { Context context, boolean enabled) {
List<SearchIndexableResource> result = new ArrayList<>(); List<SearchIndexableResource> result = new ArrayList<>();
// Remove data/time settings from search in demo mode
if (UserManager.isDeviceInDemoMode(context)) {
return result;
}
SearchIndexableResource sir = new SearchIndexableResource(context); SearchIndexableResource sir = new SearchIndexableResource(context);
sir.xmlResId = R.xml.date_time_prefs; sir.xmlResId = R.xml.date_time_prefs;

10
src/com/android/settings/SettingsActivity.java
View File

@@ -688,16 +688,6 @@ public class SettingsActivity extends SettingsBaseActivity
&& !Utils.isMonkeyRunning(), isAdmin) && !Utils.isMonkeyRunning(), isAdmin)
|| somethingChanged; || 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) final boolean showDev = DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(this)
&& !Utils.isMonkeyRunning(); && !Utils.isMonkeyRunning();
somethingChanged = setTileEnabled(changedList, new ComponentName(packageName, somethingChanged = setTileEnabled(changedList, new ComponentName(packageName,