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

Merge "Fix: \'Make profile pattern visible\'" into nyc-dev

Browse Source 
am: 0f20f969b8

* commit '0f20f969b8b231f8d376b87e4484013d73104084':
  Fix: 'Make profile pattern visible'
This commit is contained in:
Mahaver Chopra
2016-03-04 18:11:05 +00:00
committed by android-build-merger
parent ec47ce97b0 0f20f969b8
commit 45b6021cc7
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -117,7 +117,9 @@ public class SecuritySettings extends SettingsPreferenceFragment
// These switch preferences need special handling since they're not all stored in Settings. // These switch preferences need special handling since they're not all stored in Settings.
private static final String SWITCH_PREFERENCE_KEYS[] = { private static final String SWITCH_PREFERENCE_KEYS[] = {
KEY_SHOW_PASSWORD, KEY_TOGGLE_INSTALL_APPLICATIONS, KEY_UNIFICATION }; KEY_SHOW_PASSWORD, KEY_TOGGLE_INSTALL_APPLICATIONS, KEY_UNIFICATION,
KEY_VISIBLE_PATTERN_PROFILE
};
// Only allow one trust agent on the platform. // Only allow one trust agent on the platform.
private static final boolean ONLY_ONE_TRUST_AGENT = true; private static final boolean ONLY_ONE_TRUST_AGENT = true;