Merge "Fix buttons and icons for fingerprint enroll intro" into sc-dev (ca61c391) · Commits · e / os / android_packages_apps_Settings

res/layout/fingerprint_enroll_introduction.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -98,7 +98,7 @@
		android:paddingTop="24dp">

		<ImageView
		android:id="@+id/icon_fingerprint"
		android:id="@+id/icon_device_locked"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:contentDescription="@null"
		@@ -133,7 +133,7 @@
		android:paddingTop="24dp">

		<ImageView
		android:id="@+id/icon_fingerprint"
		android:id="@+id/icon_trash_can"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:contentDescription="@null"

res/values/strings.xml

+0 −8

Original line number	Diff line number	Diff line
		@@ -926,16 +926,8 @@
		<string name="security_settings_fingerprint_enroll_introduction_cancel">Cancel</string>
		<!-- Button text to cancel enrollment [CHAR LIMIT=30] -->
		<string name="security_settings_fingerprint_enroll_introduction_no_thanks">No thanks</string>
		<!-- Button text to skip enrollment [CHAR LIMIT=30] -->
		<string name="security_settings_fingerprint_enroll_introduction_skip">No thanks</string>
		<!-- Button text to continue to the next screen from the introduction [CHAR LIMIT=22] -->
		<string name="security_settings_fingerprint_enroll_introduction_continue">Continue</string>
		<!-- Button text to agree the consent and continue to the next screen from the introduction [CHAR LIMIT=22] -->
		<string name="security_settings_fingerprint_enroll_introduction_agree">I agree</string>
		<!-- Button text to cancel enrollment from the introduction (this string variant is used while in setup wizard) [CHAR LIMIT=22] -->
		<string name="security_settings_fingerprint_enroll_introduction_cancel_setup">Skip</string>
		<!-- Button text to continue to the next screen from the introduction (this string variant is used while in setup wizard) [CHAR LIMIT=22] -->
		<string name="security_settings_fingerprint_enroll_introduction_continue_setup">Next</string>
		<!-- Title of dialog shown when the user tries to skip setting up fingerprint after adding lock screen during initial setup. [CHAR LIMIT=30] -->
		<string name="setup_fingerprint_enroll_skip_title">Skip fingerprint?</string>
		<!-- Body text of dialog shown when the user tries to skip setting up fingerprint after adding lock screen during initial setup [CHAR LIMIT=NONE] -->

src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -64,9 +64,13 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction {
		super.onCreate(savedInstanceState);

		final ImageView iconFingerprint = findViewById(R.id.icon_fingerprint);
		final ImageView iconDeviceLocked = findViewById(R.id.icon_device_locked);
		final ImageView iconTrashCan = findViewById(R.id.icon_trash_can);
		final ImageView iconInfo = findViewById(R.id.icon_info);
		final ImageView iconLink = findViewById(R.id.icon_link);
		iconFingerprint.getDrawable().setColorFilter(getIconColorFilter());
		iconDeviceLocked.getDrawable().setColorFilter(getIconColorFilter());
		iconTrashCan.getDrawable().setColorFilter(getIconColorFilter());
		iconInfo.getDrawable().setColorFilter(getIconColorFilter());
		iconLink.getDrawable().setColorFilter(getIconColorFilter());

		@@ -87,7 +91,7 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction {

		@StringRes
		int getNegativeButtonTextId() {
		return R.string.security_settings_fingerprint_enroll_introduction_skip;
		return R.string.security_settings_fingerprint_enroll_introduction_no_thanks;
		}

		@StringRes

src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java

+0 −21

Original line number	Diff line number	Diff line
		@@ -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