Commit e85b7731 authored by Unknown's avatar Unknown

Merge branch 'eelo-0.2-remove-backup-reset' into eelo-0.2

parents 5b526842 604c3ad7
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2016 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.
You may obtain a copy of the License at
......@@ -26,6 +26,7 @@
android:fragment="com.android.settings.gestures.GestureSettings" />
<!-- Backup -->
<!--
<Preference
android:key="backup_settings"
android:title="@string/privacy_settings_title"
......@@ -34,6 +35,7 @@
android:order="-60">
<intent android:action="android.settings.BACKUP_AND_RESET_SETTINGS" />
</Preference>
-->
<!-- System updates -->
<Preference
......@@ -62,4 +64,4 @@
android:order="-20"
android:fragment="com.android.settings.system.ResetDashboardFragment" />
</PreferenceScreen>
\ No newline at end of file
</PreferenceScreen>
/*
* 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.
......@@ -82,7 +83,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;//UserManager.get(getActivity()).isAdminUser();
if (!mEnabled) {
return;
}
......
/*
* Copyright (C) 2014 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.
......@@ -842,8 +843,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(new ComponentName(packageName,
BackupSettingsActivity.class.getName()), true, isAdmin)
BackupSettingsActivity.class.getName()), true, false)
|| somethingChanged;
somethingChanged = setTileEnabled(new ComponentName(packageName,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment