Fix buttons and icons for fingerprint enroll intro
Updates the labels of buttons and the colors of icons shown on the fingerprint enroll intro screen to be consistent with the face enroll intro screen and match the latest mocks. Note that this commit removes some unused strings but does not add any new ones requiring l10n. Test: Manually tested face enroll from Setup Wizard and Settings Fixes: 192381823 Change-Id: Id991d4f29d6de82acd538f1853bc8a5e50cd2637
This commit is contained in:
@@ -26,7 +26,6 @@ import android.os.UserHandle;
|
||||
import android.view.View;
|
||||
|
||||
import com.android.internal.widget.LockPatternUtils;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.SetupWizardUtils;
|
||||
import com.android.settings.Utils;
|
||||
import com.android.settings.biometrics.BiometricUtils;
|
||||
@@ -34,8 +33,6 @@ import com.android.settings.password.ChooseLockSettingsHelper;
|
||||
import com.android.settings.password.SetupChooseLockGeneric;
|
||||
import com.android.settings.password.SetupSkipDialog;
|
||||
|
||||
import com.google.android.setupcompat.template.FooterButton;
|
||||
|
||||
public class SetupFingerprintEnrollIntroduction extends FingerprintEnrollIntroduction {
|
||||
/**
|
||||
* Returns the number of fingerprint enrolled.
|
||||
@@ -56,11 +53,6 @@ public class SetupFingerprintEnrollIntroduction extends FingerprintEnrollIntrodu
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
int getNegativeButtonTextId() {
|
||||
return R.string.security_settings_face_enroll_introduction_cancel;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onSaveInstanceState(Bundle outState) {
|
||||
super.onSaveInstanceState(outState);
|
||||
@@ -78,19 +70,6 @@ public class SetupFingerprintEnrollIntroduction extends FingerprintEnrollIntrodu
|
||||
return intent;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void initViews() {
|
||||
super.initViews();
|
||||
|
||||
FooterButton nextButton = getNextButton();
|
||||
nextButton.setText(
|
||||
this, R.string.security_settings_fingerprint_enroll_introduction_continue_setup);
|
||||
|
||||
final FooterButton cancelButton = getCancelButton();
|
||||
cancelButton.setText(
|
||||
this, R.string.security_settings_fingerprint_enroll_introduction_cancel_setup);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
|
||||
// if lock was already present, do not return intent data since it must have been
|
||||
|
Reference in New Issue
Block a user