New UI to hint user about strong auth
Instead of having a separate textview, we now reuse the detail textview
to show the hint.
Fix: 28204828
Change-Id: I3eff3240bf7ecb1495fbf11a073a273a0de603ae
diff --git a/res/layout/confirm_lock_password_base.xml b/res/layout/confirm_lock_password_base.xml
index 536617d..8e9a87b 100644
--- a/res/layout/confirm_lock_password_base.xml
+++ b/res/layout/confirm_lock_password_base.xml
@@ -59,15 +59,9 @@
android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"/>
- <TextView
- android:id="@+id/strongAuthRequiredText"
- style="@style/TextAppearance.ConfirmDeviceCredentialsStrongAuthRequiredText"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1"
- android:singleLine="true"
- android:ellipsize="marquee"
- android:gravity="center"/>
+ <View android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"/>
<EditText
android:id="@+id/password_entry"
diff --git a/res/layout/confirm_lock_pattern_base.xml b/res/layout/confirm_lock_pattern_base.xml
index 117c499..7c960a2 100644
--- a/res/layout/confirm_lock_pattern_base.xml
+++ b/res/layout/confirm_lock_pattern_base.xml
@@ -59,15 +59,9 @@
android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"/>
- <TextView
- android:id="@+id/strongAuthRequiredText"
- style="@style/TextAppearance.ConfirmDeviceCredentialsStrongAuthRequiredText"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="0.5"
- android:singleLine="true"
- android:ellipsize="marquee"
- android:gravity="center"/>
+ <View android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="0.5"/>
<com.android.internal.widget.LockPatternView
android:id="@+id/lockPattern"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3eb6d3d..7b019c1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3069,13 +3069,20 @@
<!-- Message to be used to explain the user that he needs to enter his work password to continue a
particular operation. [CHAR LIMIT=70]-->
<string name="lockpassword_confirm_your_password_generic_profile">Enter your work password to continue</string>
- <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
- <string name="lockpassword_strong_auth_required_reason_restart_pattern">Pattern required after device restarts</string>
- <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
- <string name="lockpassword_strong_auth_required_reason_restart_pin">PIN required after device restarts</string>
+ <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
+ <string name="lockpassword_strong_auth_required_reason_restart_device_pattern">Use your device pattern to continue. It\'s required after the device restarts.</string>
+ <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+ <string name="lockpassword_strong_auth_required_reason_restart_device_pin">Enter your device PIN to continue. It\'s required after the device restarts.</string>
<!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
- <string name="lockpassword_strong_auth_required_reason_restart_password">Password required after device restarts</string>
+ <string name="lockpassword_strong_auth_required_reason_restart_device_password">Enter your device password to continue. It\'s required after the device restarts.</string>
+
+ <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
+ <string name="lockpassword_strong_auth_required_reason_restart_work_pattern">Use your work pattern to continue. It\'s required after the device restarts.</string>
+ <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+ <string name="lockpassword_strong_auth_required_reason_restart_work_pin">Enter your work PIN to continue. It\'s required after the device restarts.</string>
+ <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+ <string name="lockpassword_strong_auth_required_reason_restart_work_password">Enter your work password to continue. It\'s required after the device restarts.</string>
<!-- Security & location settings screen, change security method screen instruction if user
enters incorrect PIN [CHAR LIMIT=30] -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 0eb566c..45d2c11 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -357,11 +357,6 @@
<item name="android:textColor">@color/warning</item>
</style>
- <style name="TextAppearance.ConfirmDeviceCredentialsStrongAuthRequiredText"
- parent="android:TextAppearance.Material.Body1">
- <item name="android:textColor">?android:attr/textColorSecondary</item>
- </style>
-
<style name="TextAppearance.Small.SwitchBar">
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textStyle">normal</item>
diff --git a/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java b/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
index 0572bcf..ae321e8 100644
--- a/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
+++ b/src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
@@ -66,7 +66,7 @@
PACKAGE + ".ConfirmCredentials.showWhenLocked";
private FingerprintUiHelper mFingerprintHelper;
- private boolean mIsStrongAuthRequired;
+ protected boolean mIsStrongAuthRequired;
private boolean mAllowFpAuthentication;
protected Button mCancelButton;
protected ImageView mFingerprintIcon;
@@ -74,7 +74,6 @@
protected int mUserId;
protected LockPatternUtils mLockPatternUtils;
protected TextView mErrorTextView;
- protected TextView mStrongAuthRequiredTextView;
protected final Handler mHandler = new Handler();
@Override
@@ -97,11 +96,6 @@
public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
mCancelButton = (Button) view.findViewById(R.id.cancelButton);
- if (mStrongAuthRequiredTextView != null) {
- // INIVISIBLE instead of GONE because it also acts as a weighted spacer
- mStrongAuthRequiredTextView.setVisibility(
- mIsStrongAuthRequired ? View.VISIBLE : View.INVISIBLE);
- }
mFingerprintIcon = (ImageView) view.findViewById(R.id.fingerprintIcon);
mFingerprintHelper = new FingerprintUiHelper(
mFingerprintIcon,
diff --git a/src/com/android/settings/ConfirmLockPassword.java b/src/com/android/settings/ConfirmLockPassword.java
index a1bc3dd..61cf2ae 100644
--- a/src/com/android/settings/ConfirmLockPassword.java
+++ b/src/com/android/settings/ConfirmLockPassword.java
@@ -50,6 +50,18 @@
public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
+ // The index of the array is isStrongAuth << 2 + isProfile << 1 + isAlpha.
+ private static final int[] DETAIL_TEXTS = new int[] {
+ R.string.lockpassword_confirm_your_pin_generic,
+ R.string.lockpassword_confirm_your_password_generic,
+ R.string.lockpassword_confirm_your_pin_generic_profile,
+ R.string.lockpassword_confirm_your_password_generic_profile,
+ R.string.lockpassword_strong_auth_required_reason_restart_device_pin,
+ R.string.lockpassword_strong_auth_required_reason_restart_device_password,
+ R.string.lockpassword_strong_auth_required_reason_restart_work_pin,
+ R.string.lockpassword_strong_auth_required_reason_restart_work_password,
+ };
+
public static class InternalActivity extends ConfirmLockPassword {
}
@@ -124,18 +136,6 @@
|| DevicePolicyManager.PASSWORD_QUALITY_COMPLEX == storedQuality
|| DevicePolicyManager.PASSWORD_QUALITY_MANAGED == storedQuality;
- // 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 = (TextView) view.findViewById(R.id.strongAuthRequiredText);
- if (mIsAlpha) {
- mStrongAuthRequiredTextView.setText(
- R.string.lockpassword_strong_auth_required_reason_restart_password);
- } else {
- mStrongAuthRequiredTextView.setText(
- R.string.lockpassword_strong_auth_required_reason_restart_pin);
- }
-
mImm = (InputMethodManager) getActivity().getSystemService(
Context.INPUT_METHOD_SERVICE);
@@ -186,13 +186,10 @@
private int getDefaultDetails() {
boolean isProfile = Utils.isManagedProfile(
UserManager.get(getActivity()), mEffectiveUserId);
- if (mIsAlpha) {
- return isProfile ? R.string.lockpassword_confirm_your_password_generic_profile
- : R.string.lockpassword_confirm_your_password_generic;
- } else {
- return isProfile ? R.string.lockpassword_confirm_your_pin_generic_profile
- : R.string.lockpassword_confirm_your_pin_generic;
- }
+ // Map boolean flags to an index by isStrongAuth << 2 + isProfile << 1 + isAlpha.
+ int index = ((mIsStrongAuthRequired ? 1 : 0) << 2) + ((isProfile ? 1 : 0 ) << 1)
+ + (mIsAlpha ? 1 : 0);
+ return DETAIL_TEXTS[index];
}
private int getErrorMessage() {
diff --git a/src/com/android/settings/ConfirmLockPattern.java b/src/com/android/settings/ConfirmLockPattern.java
index 875fcb7..262cdc8 100644
--- a/src/com/android/settings/ConfirmLockPattern.java
+++ b/src/com/android/settings/ConfirmLockPattern.java
@@ -118,7 +118,6 @@
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,13 +175,6 @@
getFragmentManager().beginTransaction().add(mCredentialCheckResultTracker,
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;
}
@@ -237,6 +229,20 @@
mFingerprintIcon.setAlpha(0f);
}
+ private int getDefaultDetails() {
+ boolean isProfile = Utils.isManagedProfile(
+ UserManager.get(getActivity()), mEffectiveUserId);
+ if (isProfile) {
+ return mIsStrongAuthRequired
+ ? R.string.lockpassword_strong_auth_required_reason_restart_work_pattern
+ : R.string.lockpassword_confirm_your_pattern_generic_profile;
+ } else {
+ return mIsStrongAuthRequired
+ ? R.string.lockpassword_strong_auth_required_reason_restart_device_pattern
+ : R.string.lockpassword_confirm_your_pattern_generic;
+ }
+ }
+
private Object[][] getActiveViews() {
ArrayList<ArrayList<Object>> result = new ArrayList<>();
result.add(new ArrayList<Object>(Collections.singletonList(mHeaderTextView)));
@@ -282,13 +288,8 @@
}
if (mDetailsText != null) {
mDetailsTextView.setText(mDetailsText);
- } else if (!Utils.isManagedProfile(
- UserManager.get(getActivity()), mEffectiveUserId)) {
- mDetailsTextView.setText(
- R.string.lockpassword_confirm_your_pattern_generic);
} else {
- mDetailsTextView.setText(
- R.string.lockpassword_confirm_your_pattern_generic_profile);
+ mDetailsTextView.setText(getDefaultDetails());
}
mErrorTextView.setText("");
if (isProfileChallenge()) {