Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e85b7731 authored by Unknown's avatar Unknown
Browse files

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

parents 5b526842 604c3ad7

res/xml/system_dashboard_fragment.xml

+4 −2
Original line number Diff line number Diff line 
<?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

src/com/android/settings/PrivacySettings.java

+3 −1
Original line number Diff line number Diff line 
/*

 * 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;

        }

src/com/android/settings/SettingsActivity.java

+3 −1
Original line number Diff line number Diff line 
/*

 * 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,