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

Commit accd8b3f authored by Mohit Mali's avatar Mohit Mali
Browse files

Update res/xml/system_dashboard_fragment.xml,... 

Update res/xml/system_dashboard_fragment.xml, src/com/android/settings/PrivacySettings.java, src/com/android/settings/SettingsActivity.java files
parent 2194961a

res/xml/system_dashboard_fragment.xml

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
        settings:controller="com.android.settings.gestures.GesturesSettingPreferenceController"/>



    <!-- Backup -->

    <!--

   

    <Preference

        android:key="backup_settings"

        android:title="@string/privacy_settings_title"
@@ -41,7 +41,7 @@ 
        settings:controller="com.android.settings.backup.BackupSettingsActivityPreferenceController">

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

    </Preference>

    -->

    

    <Preference

        android:key="reset_dashboard"

        android:title="@string/reset_dashboard_title"

src/com/android/settings/PrivacySettings.java

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,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

+1 −1
Original line number Diff line number Diff line
@@ -712,7 +712,7 @@ 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(changedList, new ComponentName(packageName,

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

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

                || somethingChanged;



        somethingChanged = setTileEnabled(changedList, new ComponentName(packageName,