summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/ConfirmLockPattern.java
diff options
context:
space:
mode:
authorDaniel U <uda@google.com>2016-04-07 19:18:26 +0100
committerDaniel U <uda@google.com>2016-04-08 15:23:46 +0100
commit6655e1b6f594af7e3d12e8dfdd976f7249abea75 (patch)
tree5aa4e92f303a78db02a62969737b49dc15d34125 /src/com/android/settings/ConfirmLockPattern.java
parent77359ad76117c3ffc7fe40890f8bbdc8736f143c (diff)
downloadpackages_apps_Settings-6655e1b6f594af7e3d12e8dfdd976f7249abea75.tar.gz
packages_apps_Settings-6655e1b6f594af7e3d12e8dfdd976f7249abea75.tar.bz2
packages_apps_Settings-6655e1b6f594af7e3d12e8dfdd976f7249abea75.zip
Hint user that fingerprint cannot unlock FBE keys
Show a hint text to user noting that pattern/PIN/password is required when decrypting the credential based storage when file based encryption is turned on. The hint text is the same as that of the device unlock screen after device reboot. Bug: 27964055 Change-Id: I0d5a493bab69eae5ce4742bd07d4851387863cac
Diffstat (limited to 'src/com/android/settings/ConfirmLockPattern.java')
-rw-r--r--src/com/android/settings/ConfirmLockPattern.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/settings/ConfirmLockPattern.java b/src/com/android/settings/ConfirmLockPattern.java
index 0a52d21268..875fcb7d10 100644
--- a/src/com/android/settings/ConfirmLockPattern.java
+++ b/src/com/android/settings/ConfirmLockPattern.java
@@ -118,6 +118,7 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
mHeaderTextView = (TextView) view.findViewById(R.id.headerText);
mLockPatternView = (LockPatternView) view.findViewById(R.id.lockPattern);
mDetailsTextView = (TextView) view.findViewById(R.id.detailsText);
+ mStrongAuthRequiredTextView = (TextView) view.findViewById(R.id.strongAuthRequiredText);
mErrorTextView = (TextView) view.findViewById(R.id.errorText);
mLeftSpacerLandscape = view.findViewById(R.id.leftSpacer);
mRightSpacerLandscape = view.findViewById(R.id.rightSpacer);
@@ -176,6 +177,12 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
FRAGMENT_TAG_CHECK_LOCK_RESULT).commit();
}
+ // Strong auth is required when the user is locked.
+ // Currently a user does not get locked again until the device restarts. Show the
+ // hint text as "device has just been restarted".
+ mStrongAuthRequiredTextView.setText(
+ R.string.lockpassword_strong_auth_required_reason_restart_pattern);
+
return view;
}