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

Commit 479f32e0 authored by Bartosz Fabianowski's avatar Bartosz Fabianowski
Browse files

Remove "Device administration" heading 

This heading was meant to go away in the new IA.

Bug: 32692748
Test: m RunSettingsRoboTests

Change-Id: I842673b01f62c2eb5eb51837d2c3d92829ac0ca0
parent e39e8350

res/values/strings.xml

+0 −3
Original line number Diff line number Diff line
@@ -1300,9 +1300,6 @@ 
    <!-- Toast shown when lock pattern or password successfully setup. [CHAR LIMIT=64] -->

    <string name="lock_setup" msgid="5507462851158901718">Setup is complete.</string>









    <!-- In the security screen, the header title for settings related to device admins -->









    <string name="device_admin_title">Device administration</string>

















    <!-- Title of preference to manage device admins -->









    <string name="manage_device_admin">Device admin apps</string>








































res/xml/security_settings_misc.xml



+1
−3






























Original line number
Diff line number
Diff line







@@ -33,9 +33,7 @@

















    </PreferenceCategory>



















    <PreferenceCategory android:key="device_admin_category"









            android:title="@string/device_admin_title"









            android:persistent="false">









    <PreferenceCategory>



















        <Preference android:key="manage_device_admin"









                android:title="@string/manage_device_admin"
































src/com/android/settings/SecuritySettings.java



+0
−5






























Original line number
Diff line number
Diff line







@@ -102,7 +102,6 @@ public class SecuritySettings extends SettingsPreferenceFragment







    private static final String KEY_UNLOCK_SET_OR_CHANGE_PROFILE = "unlock_set_or_change_profile";









    private static final String KEY_VISIBLE_PATTERN_PROFILE = "visiblepattern_profile";









    private static final String KEY_SECURITY_CATEGORY = "security_category";









    private static final String KEY_DEVICE_ADMIN_CATEGORY = "device_admin_category";









    private static final String KEY_MANAGE_TRUST_AGENTS = "manage_trust_agents";









    private static final String KEY_UNIFICATION = "unification";


















@@ -351,10 +350,6 @@ public class SecuritySettings extends SettingsPreferenceFragment







        // Credential storage









        final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);



















        // Application install









        PreferenceGroup deviceAdminCategory = (PreferenceGroup)









                root.findPreference(KEY_DEVICE_ADMIN_CATEGORY);



















        // Advanced Security features









        Preference manageAgents = root.findPreference(KEY_MANAGE_TRUST_AGENTS);









        if (manageAgents != null && !mLockPatternUtils.isSecure(MY_USER_ID)) {