diff --git a/res/values/strings.xml b/res/values/strings.xml
index 61f370b5eb8..633c111a8bc 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -746,8 +746,12 @@
Unlock with fingerprint
+
+ Use your fingerprint
Just touch the fingerprint sensor to unlock your phone, authorize purchases, or sign in to apps. Be careful whose fingerprints you add. Even one added print can do any of these things.\n\nNote: Your fingerprint may be less secure than a strong pattern or PIN.
+
+ Just touch the fingerprint sensor to authorize purchases, or sign in to apps. Be careful whose fingerprints you add. Even one added print can do any of these things.\n\nNote: You can\u2019t use your fingerprint to unlock this device. For more information, contact your organization\u2019s admin.
Just touch the fingerprint sensor to unlock your phone, authorize purchases, or sign in to apps. Be careful whose fingerprints you add. Even one added print can do any of these things.\n\nNote: Your fingerprint may be less secure than a strong pattern or PIN.
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
index 23755fdf5db..627cb78eb41 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
@@ -26,12 +26,14 @@ import android.os.UserManager;
import android.util.Log;
import android.view.View;
import android.widget.Button;
+import android.widget.TextView;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.ChooseLockGeneric;
import com.android.settings.ChooseLockSettingsHelper;
import com.android.settings.R;
import com.android.settingslib.HelpUtils;
+import com.android.settingslib.RestrictedLockUtils;
import com.android.setupwizardlib.span.LinkSpan;
/**
@@ -48,12 +50,21 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase
private UserManager mUserManager;
private boolean mHasPassword;
+ private boolean mFingerprintUnlockDisabledByAdmin;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ mFingerprintUnlockDisabledByAdmin = RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(
+ this, DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT, mUserId) != null;
+
setContentView(R.layout.fingerprint_enroll_introduction);
- setHeaderText(R.string.security_settings_fingerprint_enroll_introduction_title);
+ if (mFingerprintUnlockDisabledByAdmin) {
+ setHeaderText(R.string
+ .security_settings_fingerprint_enroll_introduction_title_unlock_disabled);
+ } else {
+ setHeaderText(R.string.security_settings_fingerprint_enroll_introduction_title);
+ }
final Button cancelButton = (Button) findViewById(R.id.fingerprint_cancel_button);
cancelButton.setOnClickListener(this);
@@ -160,6 +171,17 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase
finish();
}
+ @Override
+ protected void initViews() {
+ super.initViews();
+
+ TextView description = (TextView) findViewById(R.id.description_text);
+ if (mFingerprintUnlockDisabledByAdmin) {
+ description.setText(R.string
+ .security_settings_fingerprint_enroll_introduction_message_unlock_disabled);
+ }
+ }
+
@Override
public void onClick(LinkSpan span) {
if ("url".equals(span.getId())) {