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

renaming/removing fingerprints should be reflected in UI if fingerprintservice lags

Browse Source 
Bug: 30252265
Test: manual
Change-Id: I27761608e52f1437fc7a43bfb48a1f09922d1c0f
This commit is contained in:
Kevin Chyn
2017-03-23 11:12:26 -07:00
parent dc43b64c54
commit bb994166cb
2 changed files with 236 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
src/com/android/settings/fingerprint/FingerprintSettings.java
View File

@@ -31,7 +31,6 @@ import android.hardware.fingerprint.Fingerprint;
import android.hardware.fingerprint.FingerprintManager;
import android.hardware.fingerprint.FingerprintManager.AuthenticationCallback;
import android.hardware.fingerprint.FingerprintManager.AuthenticationResult;
import android.hardware.fingerprint.FingerprintManager.RemovalCallback;
import android.os.Bundle;
import android.os.CancellationSignal;
import android.os.Handler;
@@ -64,11 +63,11 @@ import com.android.settings.SubSettings;
import com.android.settings.Utils;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.widget.FooterPreference;
import com.android.settings.widget.FooterPreferenceMixin;
import com.android.settingslib.HelpUtils;
import com.android.settingslib.RestrictedLockUtils;
import java.util.List;
import java.util.HashMap;
import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
@@ -160,6 +159,10 @@ public class FingerprintSettings extends SubSettings {
private Drawable mHighlightDrawable;
private int mUserId;
private static final String TAG_REMOVAL_SIDECAR = "removal_sidecar";
private FingerprintRemoveSidecar mRemovalSidecar;
private HashMap<Integer, String> mFingerprintsRenaming;
private AuthenticationCallback mAuthCallback = new AuthenticationCallback() {
@Override
public void onAuthenticationSucceeded(AuthenticationResult result) {
@@ -184,22 +187,30 @@ public class FingerprintSettings extends SubSettings {
.sendToTarget();
}
};
private RemovalCallback mRemoveCallback = new RemovalCallback() {
@Override
FingerprintRemoveSidecar.Listener mRemovalListener =
new FingerprintRemoveSidecar.Listener() {
public void onRemovalSucceeded(Fingerprint fingerprint) {
mHandler.obtainMessage(MSG_REFRESH_FINGERPRINT_TEMPLATES,
fingerprint.getFingerId(), 0).sendToTarget();
updateDialog();
}
@Override
public void onRemovalError(Fingerprint fp, int errMsgId, CharSequence errString) {
final Activity activity = getActivity();
if (activity != null) {
Toast.makeText(activity, errString, Toast.LENGTH_SHORT);
}
updateDialog();
}
private void updateDialog() {
RenameDeleteDialog renameDeleteDialog = (RenameDeleteDialog)getFragmentManager().
findFragmentByTag(RenameDeleteDialog.class.getName());
if (renameDeleteDialog != null) {
renameDeleteDialog.enableDelete();
}
}
};
private final Handler mHandler = new Handler() {
@Override
public void handleMessage(android.os.Message msg) {
@@ -263,6 +274,9 @@ public class FingerprintSettings extends SubSettings {
}
private void retryFingerprint() {
if (mRemovalSidecar.inProgress()) {
return;
}
if (!mInFingerprintLockout) {
mFingerprintCancel = new CancellationSignal();
mFingerprintManager.authenticate(null, mFingerprintCancel, 0 /* flags */,
@@ -278,7 +292,31 @@ public class FingerprintSettings extends SubSettings {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Activity activity = getActivity();
mFingerprintManager = Utils.getFingerprintManagerOrNull(activity);
mRemovalSidecar = (FingerprintRemoveSidecar)
getFragmentManager().findFragmentByTag(TAG_REMOVAL_SIDECAR);
if (mRemovalSidecar == null) {
mRemovalSidecar = new FingerprintRemoveSidecar();
getFragmentManager().beginTransaction()
.add(mRemovalSidecar, TAG_REMOVAL_SIDECAR).commit();
}
mRemovalSidecar.setFingerprintManager(mFingerprintManager);
mRemovalSidecar.setListener(mRemovalListener);
RenameDeleteDialog renameDeleteDialog = (RenameDeleteDialog)getFragmentManager().
findFragmentByTag(RenameDeleteDialog.class.getName());
if (renameDeleteDialog != null) {
renameDeleteDialog.setDeleteInProgress(mRemovalSidecar.inProgress());
}
mFingerprintsRenaming = new HashMap<Integer, String>();
if (savedInstanceState != null) {
mFingerprintsRenaming = (HashMap<Integer, String>)
savedInstanceState.getSerializable("mFingerprintsRenaming");
mToken = savedInstanceState.getByteArray(
ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
mLaunchedConfirm = savedInstanceState.getBoolean(
@@ -287,9 +325,6 @@ public class FingerprintSettings extends SubSettings {
mUserId = getActivity().getIntent().getIntExtra(
Intent.EXTRA_USER_ID, UserHandle.myUserId());
Activity activity = getActivity();
mFingerprintManager = Utils.getFingerprintManagerOrNull(activity);
// Need to authenticate a session token if none
if (mToken == null && mLaunchedConfirm == false) {
mLaunchedConfirm = true;
@@ -347,6 +382,12 @@ public class FingerprintSettings extends SubSettings {
pref.setFingerprint(item);
pref.setPersistent(false);
pref.setIcon(R.drawable.ic_fingerprint_24dp);
if (mRemovalSidecar.isRemovingFingerprint(item.getFingerId())) {
pref.setEnabled(false);
}
if (mFingerprintsRenaming.containsKey(item.getFingerId())) {
pref.setTitle(mFingerprintsRenaming.get(item.getFingerId()));
}
root.addPreference(pref);
pref.setOnPreferenceChangeListener(this);
}
@@ -364,11 +405,14 @@ public class FingerprintSettings extends SubSettings {
final int max = getContext().getResources().getInteger(
com.android.internal.R.integer.config_fingerprintMaxTemplatesPerUser);
boolean tooMany = mFingerprintManager.getEnrolledFingerprints(mUserId).size() >= max;
// retryFingerprint() will be called when remove finishes
// need to disable enroll or have a way to determine if enroll is in progress
final boolean removalInProgress = mRemovalSidecar.inProgress();
CharSequence maxSummary = tooMany ?
getContext().getString(R.string.fingerprint_add_max, max) : "";
Preference addPreference = findPreference(KEY_FINGERPRINT_ADD);
addPreference.setSummary(maxSummary);
addPreference.setEnabled(!tooMany);
addPreference.setEnabled(!tooMany && !removalInProgress);
}
private static String genKey(int id) {
@@ -399,6 +443,7 @@ public class FingerprintSettings extends SubSettings {
outState.putByteArray(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN,
mToken);
outState.putBoolean(KEY_LAUNCHED_CONFIRM, mLaunchedConfirm);
outState.putSerializable("mFingerprintsRenaming", mFingerprintsRenaming);
}
@Override
@@ -413,7 +458,7 @@ public class FingerprintSettings extends SubSettings {
startActivityForResult(intent, ADD_FINGERPRINT_REQUEST);
} else if (pref instanceof FingerprintPreference) {
FingerprintPreference fpref = (FingerprintPreference) pref;
final Fingerprint fp =fpref.getFingerprint();
final Fingerprint fp = fpref.getFingerprint();
showRenameDeleteDialog(fp);
return super.onPreferenceTreeClick(pref);
}
@@ -423,7 +468,14 @@ public class FingerprintSettings extends SubSettings {
private void showRenameDeleteDialog(final Fingerprint fp) {
RenameDeleteDialog renameDeleteDialog = new RenameDeleteDialog();
Bundle args = new Bundle();
args.putParcelable("fingerprint", fp);
if (mFingerprintsRenaming.containsKey(fp.getFingerId())) {
final Fingerprint f = new Fingerprint(mFingerprintsRenaming.get(fp.getFingerId()),
fp.getGroupId(), fp.getFingerId(), fp.getDeviceId());
args.putParcelable("fingerprint", f);
} else {
args.putParcelable("fingerprint", fp);
}
renameDeleteDialog.setDeleteInProgress(mRemovalSidecar.inProgress());
renameDeleteDialog.setArguments(args);
renameDeleteDialog.setTargetFragment(this, 0);
renameDeleteDialog.show(getFragmentManager(), RenameDeleteDialog.class.getName());
@@ -481,6 +533,7 @@ public class FingerprintSettings extends SubSettings {
Log.w(TAG, "postEnroll failed: result = " + result);
}
}
mRemovalSidecar.setListener(null);
}
private Drawable getHighlightDrawable() {
@@ -535,11 +588,16 @@ public class FingerprintSettings extends SubSettings {
}
private void deleteFingerPrint(Fingerprint fingerPrint) {
mFingerprintManager.remove(fingerPrint, mUserId, mRemoveCallback);
mRemovalSidecar.startRemove(fingerPrint, mUserId);
String name = genKey(fingerPrint.getFingerId());
Preference prefToRemove = findPreference(name);
prefToRemove.setEnabled(false);
updateAddPreference();
}
private void renameFingerPrint(int fingerId, String newName) {
mFingerprintManager.rename(fingerId, mUserId, newName);
mFingerprintsRenaming.put(fingerId, newName);
updatePreferences();
}
@@ -559,7 +617,12 @@ public class FingerprintSettings extends SubSettings {
private Boolean mTextHadFocus;
private int mTextSelectionStart;
private int mTextSelectionEnd;
private AlertDialog mAlertDialog;
private boolean mDeleteInProgress;
public void setDeleteInProgress(boolean deleteInProgress) {
mDeleteInProgress = deleteInProgress;
}
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
mFp = getArguments().getParcelable("fingerprint");
@@ -569,7 +632,7 @@ public class FingerprintSettings extends SubSettings {
mTextSelectionStart = savedInstanceState.getInt("startSelection");
mTextSelectionEnd = savedInstanceState.getInt("endSelection");
}
final AlertDialog alertDialog = new AlertDialog.Builder(getActivity())
mAlertDialog = new AlertDialog.Builder(getActivity())
.setView(R.layout.fingerprint_rename_dialog)
.setPositiveButton(R.string.security_settings_fingerprint_enroll_dialog_ok,
new DialogInterface.OnClickListener() {
@@ -603,10 +666,10 @@ public class FingerprintSettings extends SubSettings {
}
})
.create();
alertDialog.setOnShowListener(new DialogInterface.OnShowListener() {
mAlertDialog.setOnShowListener(new DialogInterface.OnShowListener() {
@Override
public void onShow(DialogInterface dialog) {
mDialogTextField = (EditText) alertDialog.findViewById(
mDialogTextField = (EditText) mAlertDialog.findViewById(
R.id.fingerprint_rename_field);
CharSequence name = mFingerName == null ? mFp.getName() : mFingerName;
mDialogTextField.setText(name);
@@ -615,14 +678,24 @@ public class FingerprintSettings extends SubSettings {
} else {
mDialogTextField.setSelection(mTextSelectionStart, mTextSelectionEnd);
}
if (mDeleteInProgress) {
mAlertDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setEnabled(false);
}
}
});
if (mTextHadFocus == null || mTextHadFocus) {
// Request the IME
alertDialog.getWindow().setSoftInputMode(
mAlertDialog.getWindow().setSoftInputMode(
WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
}
return alertDialog;
return mAlertDialog;
}
public void enableDelete() {
mDeleteInProgress = false;
if (mAlertDialog != null) {
mAlertDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setEnabled(true);
}
}
private void onDeleteClick(DialogInterface dialog) {