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
This commit is contained in:
Tony Mak
2016-04-21 10:27:43 +01:00
parent 623a289b9a
commit 7655be05c1
7 changed files with 50 additions and 68 deletions

View File

@@ -66,7 +66,7 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends OptionsMenuFra
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 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends OptionsMenuFra
protected int mUserId;
protected LockPatternUtils mLockPatternUtils;
protected TextView mErrorTextView;
protected TextView mStrongAuthRequiredTextView;
protected final Handler mHandler = new Handler();
@Override
@@ -97,11 +96,6 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends OptionsMenuFra
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,