LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 94a862f0: Add new "pin complex" type to supported keyguard PINs

Browse Source 
* commit '94a862f010399b46e38178e325f9e0da00c12ef8':
  Add new "pin complex" type to supported keyguard PINs
This commit is contained in:
Jim Miller
2014-07-17 17:01:37 +00:00
committed by Android Git Automerger
parent d54e91cf9b 94a862f010
commit 44f8eb157b
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
samples/ApiDemos/res/values/arrays.xml
View File

@@ -102,6 +102,7 @@
<item>Unspecified</item> <item>Unspecified</item>
<item>Something</item> <item>Something</item>
<item>Numeric</item> <item>Numeric</item>
<item>Numeric(Complex)</item>
<item>Alphabetic</item> <item>Alphabetic</item>
<item>Alphanumeric</item> <item>Alphanumeric</item>
<item>Complex</item> <item>Complex</item>

8
samples/ApiDemos/src/com/example/android/apis/app/DeviceAdminSample.java
View File

@@ -133,7 +133,11 @@ public class DeviceAdminSample extends PreferenceActivity {
@Override @Override
protected boolean isValidFragment(String fragmentName) { protected boolean isValidFragment(String fragmentName) {
return GeneralFragment.class.getName().equals(fragmentName); return GeneralFragment.class.getName().equals(fragmentName)
|| QualityFragment.class.getName().equals(fragmentName)
|| ExpirationFragment.class.getName().equals(fragmentName)
|| LockWipeFragment.class.getName().equals(fragmentName)
|| EncryptionFragment.class.getName().equals(fragmentName);
} }
/** /**
@@ -437,6 +441,7 @@ public class DeviceAdminSample extends PreferenceActivity {
DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED, DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED,
DevicePolicyManager.PASSWORD_QUALITY_SOMETHING, DevicePolicyManager.PASSWORD_QUALITY_SOMETHING,
DevicePolicyManager.PASSWORD_QUALITY_NUMERIC, DevicePolicyManager.PASSWORD_QUALITY_NUMERIC,
DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX,
DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC, DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC,
DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC, DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC,
DevicePolicyManager.PASSWORD_QUALITY_COMPLEX DevicePolicyManager.PASSWORD_QUALITY_COMPLEX
@@ -448,6 +453,7 @@ public class DeviceAdminSample extends PreferenceActivity {
String.valueOf(DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED), String.valueOf(DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED),
String.valueOf(DevicePolicyManager.PASSWORD_QUALITY_SOMETHING), String.valueOf(DevicePolicyManager.PASSWORD_QUALITY_SOMETHING),
String.valueOf(DevicePolicyManager.PASSWORD_QUALITY_NUMERIC), String.valueOf(DevicePolicyManager.PASSWORD_QUALITY_NUMERIC),
String.valueOf(DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX),
String.valueOf(DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC), String.valueOf(DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC),
String.valueOf(DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC), String.valueOf(DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC),
String.valueOf(DevicePolicyManager.PASSWORD_QUALITY_COMPLEX) String.valueOf(DevicePolicyManager.PASSWORD_QUALITY_COMPLEX)