Merge "Re enable remove button after cancel" into qt-dev

This commit is contained in:
TreeHugger Robot
2019-05-16 00:51:26 +00:00
committed by Android (Google) Code Review

View File

@@ -94,6 +94,7 @@ public class FaceSettingsRemoveButtonPreferenceController extends BasePreference
Log.e(TAG, "Unable to remove face: " + face.getBiometricId() Log.e(TAG, "Unable to remove face: " + face.getBiometricId()
+ " error: " + errMsgId + " " + errString); + " error: " + errMsgId + " " + errString);
Toast.makeText(mContext, errString, Toast.LENGTH_SHORT).show(); Toast.makeText(mContext, errString, Toast.LENGTH_SHORT).show();
mRemoving = false;
} }
@Override @Override
@@ -131,6 +132,7 @@ public class FaceSettingsRemoveButtonPreferenceController extends BasePreference
mFaceManager.remove(faces.get(0), mUserId, mRemovalCallback); mFaceManager.remove(faces.get(0), mUserId, mRemovalCallback);
} else { } else {
mButton.setEnabled(true); mButton.setEnabled(true);
mRemoving = false;
} }
} }
}; };