PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove "Device administration" heading

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

Bug: 32692748
Test: m RunSettingsRoboTests

Change-Id: I842673b01f62c2eb5eb51837d2c3d92829ac0ca0
This commit is contained in:
Bartosz Fabianowski
2017-03-20 19:10:02 +01:00
parent e39e8350a1
commit 479f32e0ed
3 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/strings.xml
View File

@@ -1300,9 +1300,6 @@
<!-- Toast shown when lock pattern or password successfully setup. [CHAR LIMIT=64] --> <!-- Toast shown when lock pattern or password successfully setup. [CHAR LIMIT=64] -->
<string name="lock_setup" msgid="5507462851158901718">Setup is complete.</string> <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 --> <!-- Title of preference to manage device admins -->
<string name="manage_device_admin">Device admin apps</string> <string name="manage_device_admin">Device admin apps</string>

4
res/xml/security_settings_misc.xml
View File

@@ -33,9 +33,7 @@
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:key="device_admin_category" <PreferenceCategory>
android:title="@string/device_admin_title"
android:persistent="false">
<Preference android:key="manage_device_admin" <Preference android:key="manage_device_admin"
android:title="@string/manage_device_admin" android:title="@string/manage_device_admin"

5
src/com/android/settings/SecuritySettings.java
View File

@@ -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_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_VISIBLE_PATTERN_PROFILE = "visiblepattern_profile";
private static final String KEY_SECURITY_CATEGORY = "security_category"; 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_MANAGE_TRUST_AGENTS = "manage_trust_agents";
private static final String KEY_UNIFICATION = "unification"; private static final String KEY_UNIFICATION = "unification";
@@ -351,10 +350,6 @@ public class SecuritySettings extends SettingsPreferenceFragment
// Credential storage // Credential storage
final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE); final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
// Application install
PreferenceGroup deviceAdminCategory = (PreferenceGroup)
root.findPreference(KEY_DEVICE_ADMIN_CATEGORY);
// Advanced Security features // Advanced Security features
Preference manageAgents = root.findPreference(KEY_MANAGE_TRUST_AGENTS); Preference manageAgents = root.findPreference(KEY_MANAGE_TRUST_AGENTS);
if (manageAgents != null && !mLockPatternUtils.isSecure(MY_USER_ID)) { if (manageAgents != null && !mLockPatternUtils.isSecure(MY_USER_ID)) {