Merge "Excluding ChooseLockGeneric from recents"
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 44db767..5ee80bf 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -208,7 +208,7 @@
<item>fra</item>
<item>deu</item>
<item>ita</item>
- <item>esp</item>
+ <item>spa</item>
</string-array>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e0e0819..37441a4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1132,11 +1132,11 @@
<!-- Used in the 1st-level settings screen to turn on NFC -->
<string name="nfc_quick_toggle_title">NFC</string>
<!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
- <string name="nfc_quick_toggle_summary">Allow devices separated by a few centimeters to exchange information</string>
+ <string name="nfc_quick_toggle_summary">Allow data exchange when the phone touches another device</string>
<!-- Used to enter the Android Beam sharing preferences screen. This phrase is a trademark. [CHAR LIMIT=32] -->
<string name="android_beam_settings_title">Android Beam</string>
<!-- Used to describe the on state of the Android Beam feature [CHAR LIMIT=NONE] -->
- <string name="android_beam_on_summary">On</string>
+ <string name="android_beam_on_summary">Ready to transmit app content via NFC</string>
<!-- Used to describe the off state of the Android Beam feature [CHAR LIMIT=NONE] -->
<string name="android_beam_off_summary">Off</string>
<!-- Used to describe the enabled state of the Android Beam feature when NFC, which it relies on, is turned off [CHAR LIMIT=NONE] -->
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index 9301a86..d589aa3 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -22,7 +22,6 @@
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-import android.os.SystemProperties;
import android.preference.Preference;
import android.preference.PreferenceActivity;
import android.preference.PreferenceScreen;
@@ -231,8 +230,8 @@
final PreferenceScreen entries = getPreferenceScreen();
final boolean onlyShowFallback = getActivity().getIntent()
.getBooleanExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false);
- final boolean weakBiometricAvailable = isBiometricSensorAvailable(
- DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK);
+ final boolean weakBiometricAvailable =
+ mChooseLockSettingsHelper.utils().isBiometricWeakInstalled();
for (int i = entries.getPreferenceCount() - 1; i >= 0; --i) {
Preference pref = entries.getPreference(i);
if (pref instanceof PreferenceScreen) {
@@ -275,10 +274,6 @@
KEY_UNLOCK_SET_PATTERN.equals(key) || KEY_UNLOCK_SET_PIN.equals(key);
}
- private boolean isBiometricSensorAvailable(int quality) {
- return SystemProperties.getBoolean("ro.lockscreen.facelock_enabled", false);
- }
-
private Intent getBiometricSensorIntent(int quality) {
Intent fallBackIntent = new Intent().setClass(getActivity(), ChooseLockGeneric.class);
fallBackIntent.putExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, true);
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 5b8035d..6023389 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -106,7 +106,8 @@
} else {
resid = R.xml.security_settings_chooser;
}
- } else if (mLockPatternUtils.usingBiometricWeak()) {
+ } else if (mLockPatternUtils.usingBiometricWeak() &&
+ mLockPatternUtils.isBiometricWeakInstalled()) {
resid = R.xml.security_settings_biometric_weak;
} else {
switch (mLockPatternUtils.getKeyguardStoredPasswordQuality()) {