http://download.youkuaiyun.com/download/zhang_mq/9222807
/Settings/res/layout/hidden_apps_list.xml
/Settings/res/layout/hidden_apps_list_item.xml
private boolean getProtectedStateFromComponentName(ComponentName componentName) {
return mProtectedApps.contains(componentName);
}
import android.content.pm.PackageManager;
private PackageManager mPackageManager;
+++ b/src/com/android/settings/ChooseLockGeneric.java
startFragment(this, "com.android.settings.ChooseLockGeneric$ChooseLockGenericFragment",
R.string.lock_settings_picker_title, SET_OR_CHANGE_LOCK_METHOD_REQUEST, null);
@@ -384,7 +384,7 @@ public class ChooseLockGeneric extends SettingsActivity {
&& SystemProperties.get("ro.build.fingerprint").equals("")) {
entries.removePreference(findPreference(KEY_UNLOCK_SET_FINGERPRINT));
} else {
- enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX;
+ enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
}
// [SIMT-lei.tan-2016-03-02]
// add by sileadinc end
@@ -424,6 +424,9 @@ public class ChooseLockGeneric extends SettingsActivity {
case KEY_UNLOCK_SET_PASSWORD: {
preference.setSummary(summary);
} break;
+ case KEY_UNLOCK_SET_FINGERPRINT:
+ preference.setSummary(R.string.unlock_set_unlock_launch_picker_title);
+ break;
}
}
}
@@ -656,7 +659,8 @@ public class ChooseLockGeneric extends SettingsActivity {
maybeEnableEncryption(
DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC, false);
// add by sileadinc start
- } else if (KEY_UNLOCK_SET_FINGERPRINT.equals(unlockMethod)) {
+ } else if (KEY_UNLOCK_SET_FINGERPRINT.equals(unlockMethod)
+ && SystemProperties.get("ro.build.fingerprint").equals("")) {
maybeEnableEncryptionFP(DevicePolicyManager.PASSWORD_QUALITY_NUMERIC, false);
// add by sileadinc end
} else {
/Settings/res/layout/hidden_apps_list.xml
/Settings/res/layout/hidden_apps_list_item.xml
private boolean getProtectedStateFromComponentName(ComponentName componentName) {
return mProtectedApps.contains(componentName);
}
import android.content.pm.PackageManager;
private PackageManager mPackageManager;
+++ b/src/com/android/settings/ChooseLockGeneric.java
startFragment(this, "com.android.settings.ChooseLockGeneric$ChooseLockGenericFragment",
R.string.lock_settings_picker_title, SET_OR_CHANGE_LOCK_METHOD_REQUEST, null);
@@ -384,7 +384,7 @@ public class ChooseLockGeneric extends SettingsActivity {
&& SystemProperties.get("ro.build.fingerprint").equals("")) {
entries.removePreference(findPreference(KEY_UNLOCK_SET_FINGERPRINT));
} else {
- enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX;
+ enabled = quality <= DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
}
// [SIMT-lei.tan-2016-03-02]
// add by sileadinc end
@@ -424,6 +424,9 @@ public class ChooseLockGeneric extends SettingsActivity {
case KEY_UNLOCK_SET_PASSWORD: {
preference.setSummary(summary);
} break;
+ case KEY_UNLOCK_SET_FINGERPRINT:
+ preference.setSummary(R.string.unlock_set_unlock_launch_picker_title);
+ break;
}
}
}
@@ -656,7 +659,8 @@ public class ChooseLockGeneric extends SettingsActivity {
maybeEnableEncryption(
DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC, false);
// add by sileadinc start
- } else if (KEY_UNLOCK_SET_FINGERPRINT.equals(unlockMethod)) {
+ } else if (KEY_UNLOCK_SET_FINGERPRINT.equals(unlockMethod)
+ && SystemProperties.get("ro.build.fingerprint").equals("")) {
maybeEnableEncryptionFP(DevicePolicyManager.PASSWORD_QUALITY_NUMERIC, false);
// add by sileadinc end
} else {