PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Hint user that fingerprint cannot unlock FBE keys" into nyc-dev am: 2f99770

Browse Source 
am: a62dd8b

* commit 'a62dd8b1d116ca0f17a33551480f8173e1ff9b31':
  Hint user that fingerprint cannot unlock FBE keys

Change-Id: I1fbf61bd752ace0b52b3de4e8f9f5945a6b3aa21
This commit is contained in:
Ricky Wai
2016-04-12 11:20:54 +00:00
committed by android-build-merger
parent 6322fa7e0c a62dd8b1d1
commit e4b811fe6a
7 changed files with 61 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
res/layout/confirm_lock_password_base.xml
View File

@@ -59,9 +59,15 @@
android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"/>
<View android:layout_width="match_parent"
<TextView
android:id="@+id/strongAuthRequiredText"
style="@style/TextAppearance.ConfirmDeviceCredentialsStrongAuthRequiredText"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"/>
android:layout_weight="1"
android:singleLine="true"
android:ellipsize="marquee"
android:gravity="center"/>
<EditText
android:id="@+id/password_entry"

10
res/layout/confirm_lock_pattern_base.xml
View File

@@ -59,9 +59,15 @@
android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"/>
<View android:layout_width="match_parent"
<TextView
android:id="@+id/strongAuthRequiredText"
style="@style/TextAppearance.ConfirmDeviceCredentialsStrongAuthRequiredText"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="0.5"/>
android:layout_weight="0.5"
android:singleLine="true"
android:ellipsize="marquee"
android:gravity="center"/>
<com.android.internal.widget.LockPatternView
android:id="@+id/lockPattern"

7
res/values/strings.xml
View File

@@ -3069,6 +3069,13 @@
<!-- 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 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>
<!-- Security & location settings screen, change security method screen instruction if user
enters incorrect PIN [CHAR LIMIT=30] -->

5
res/values/styles.xml
View File

@@ -357,6 +357,11 @@
<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>

15
src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java
View File

@@ -66,6 +66,7 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends OptionsMenuFra
PACKAGE + ".ConfirmCredentials.showWhenLocked";
private FingerprintUiHelper mFingerprintHelper;
private boolean mIsStrongAuthRequired;
private boolean mAllowFpAuthentication;
protected Button mCancelButton;
protected ImageView mFingerprintIcon;
@@ -73,6 +74,7 @@ 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
@@ -85,7 +87,9 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends OptionsMenuFra
mUserId = Utils.getUserIdFromBundle(getActivity(), intent.getExtras());
final UserManager userManager = UserManager.get(getActivity());
mEffectiveUserId = userManager.getCredentialOwnerProfile(mUserId);
mAllowFpAuthentication = mAllowFpAuthentication && !isFingerprintDisabledByAdmin();
mIsStrongAuthRequired = isStrongAuthRequired();
mAllowFpAuthentication = mAllowFpAuthentication && !isFingerprintDisabledByAdmin()
&& !mIsStrongAuthRequired;
mLockPatternUtils = new LockPatternUtils(getActivity());
}
@@ -93,6 +97,11 @@ 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,
@@ -123,6 +132,10 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends OptionsMenuFra
return (disabledFeatures & DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT) != 0;
}
private boolean isStrongAuthRequired() {
return !(UserManager.get(getContext()).isUserUnlocked(mEffectiveUserId));
}
@Override
public void onResume() {
super.onResume();

12
src/com/android/settings/ConfirmLockPassword.java
View File

@@ -124,6 +124,18 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
|| 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);

7
src/com/android/settings/ConfirmLockPattern.java
View File

@@ -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;
}