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

Commit 3eeb2908 authored by Amit Kumar's avatar Amit Kumar
Browse files

Enable backup/restore 

Change-Id: I3ebc2ed6232c0287abddeec122db34cb4a28811d
parent a9b2f494

res/xml/system_dashboard_fragment.xml

+9 −2
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
        android:fragment="com.android.settings.gestures.GestureSettings" />



    <!-- Backup -->

    <!--

    <Preference

        android:key="backup_settings"

        android:title="@string/privacy_settings_title"
@@ -35,7 +34,15 @@ 
        android:order="-60">

        <intent android:action="android.settings.BACKUP_AND_RESET_SETTINGS" />

    </Preference>

    -->

    

    <Preference

        android:key="reset_dashboard"

        android:title="@string/reset_dashboard_title"

        android:summary="@string/reset_dashboard_summary"

        android:icon="@drawable/ic_restore"

        android:order="-50"

        android:fragment="com.android.settings.system.ResetDashboardFragment"

        settings:controller="com.android.settings.system.ResetPreferenceController"/>



    <!-- System updates -->

    <Preference

src/com/android/settings/PrivacySettings.java

+2 −2
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ public class PrivacySettings extends SettingsPreferenceFragment { 
        // Don't allow any access if this is not an admin user.

        // TODO: backup/restore currently only works with owner user b/22760572

        // /e/ Do NOT display Backup & reset item for the moment.

        mEnabled = false;//UserManager.get(getActivity()).isAdminUser();

        mEnabled = UserManager.get(getActivity()).isAdminUser();

        if (!mEnabled) {

            return;

        }

src/com/android/settings/SettingsActivity.java

+3 −3
Original line number Diff line number Diff line
@@ -850,8 +850,8 @@ public class SettingsActivity extends SettingsDrawerActivity 


        // 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, false)

        somethingChanged = setTileEnabled(changedList, new ComponentName(packageName,

                BackupSettingsActivity.class.getName()), true, isAdmin)

                || somethingChanged;



        somethingChanged = setTileEnabled(new ComponentName(packageName,