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

Merge "Persist state of no thanks button." into tm-dev

Browse Source
This commit is contained in:
Joe Bolinger
2022-02-28 18:02:28 +00:00
committed by Android (Google) Code Review
parent 969625bc8e 017545c6d1
commit 72f84a96d8
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
View File

@@ -56,6 +56,7 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
private static final String TAG = "BiometricEnrollIntroduction"; private static final String TAG = "BiometricEnrollIntroduction";
private static final String KEY_CONFIRMING_CREDENTIALS = "confirming_credentials"; private static final String KEY_CONFIRMING_CREDENTIALS = "confirming_credentials";
private static final String KEY_SCROLLED_TO_BOTTOM = "scrolled";
private UserManager mUserManager; private UserManager mUserManager;
private boolean mHasPassword; private boolean mHasPassword;
@@ -64,6 +65,7 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
protected boolean mConfirmingCredentials; protected boolean mConfirmingCredentials;
protected boolean mNextClicked; protected boolean mNextClicked;
private boolean mParentalConsentRequired; private boolean mParentalConsentRequired;
private boolean mHasScrolledToBottom = false;
@Nullable private PorterDuffColorFilter mIconColorFilter; @Nullable private PorterDuffColorFilter mIconColorFilter;
@@ -152,6 +154,7 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
if (savedInstanceState != null) { if (savedInstanceState != null) {
mConfirmingCredentials = savedInstanceState.getBoolean(KEY_CONFIRMING_CREDENTIALS); mConfirmingCredentials = savedInstanceState.getBoolean(KEY_CONFIRMING_CREDENTIALS);
mHasScrolledToBottom = savedInstanceState.getBoolean(KEY_SCROLLED_TO_BOTTOM);
} }
Intent intent = getIntent(); Intent intent = getIntent();
@@ -196,14 +199,14 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
mFooterBarMixin = layout.getMixin(FooterBarMixin.class); mFooterBarMixin = layout.getMixin(FooterBarMixin.class);
mFooterBarMixin.setPrimaryButton(getPrimaryFooterButton()); mFooterBarMixin.setPrimaryButton(getPrimaryFooterButton());
mFooterBarMixin.setSecondaryButton(getSecondaryFooterButton(), true /* usePrimaryStyle */); mFooterBarMixin.setSecondaryButton(getSecondaryFooterButton(), true /* usePrimaryStyle */);
mFooterBarMixin.getSecondaryButton().setVisibility(View.INVISIBLE); mFooterBarMixin.getSecondaryButton().setVisibility(
mHasScrolledToBottom ? View.VISIBLE : View.INVISIBLE);
final RequireScrollMixin requireScrollMixin = layout.getMixin(RequireScrollMixin.class); final RequireScrollMixin requireScrollMixin = layout.getMixin(RequireScrollMixin.class);
requireScrollMixin.requireScrollWithButton(this, getPrimaryFooterButton(), requireScrollMixin.requireScrollWithButton(this, getPrimaryFooterButton(),
getMoreButtonTextRes(), this::onNextButtonClick); getMoreButtonTextRes(), this::onNextButtonClick);
requireScrollMixin.setOnRequireScrollStateChangedListener( requireScrollMixin.setOnRequireScrollStateChangedListener(
scrollNeeded -> { scrollNeeded -> {
boolean enrollmentCompleted = checkMaxEnrolled() != 0; boolean enrollmentCompleted = checkMaxEnrolled() != 0;
if (!enrollmentCompleted) { if (!enrollmentCompleted) {
// Update text of primary button from "More" to "Agree". // Update text of primary button from "More" to "Agree".
@@ -216,6 +219,7 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
// Show secondary button once scroll is completed. // Show secondary button once scroll is completed.
if (!scrollNeeded) { if (!scrollNeeded) {
getSecondaryFooterButton().setVisibility(View.VISIBLE); getSecondaryFooterButton().setVisibility(View.VISIBLE);
mHasScrolledToBottom = true;
} }
}); });
} }
@@ -241,6 +245,7 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
protected void onSaveInstanceState(Bundle outState) { protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState); super.onSaveInstanceState(outState);
outState.putBoolean(KEY_CONFIRMING_CREDENTIALS, mConfirmingCredentials); outState.putBoolean(KEY_CONFIRMING_CREDENTIALS, mConfirmingCredentials);
outState.putBoolean(KEY_SCROLLED_TO_BOTTOM, mHasScrolledToBottom);
} }
@Override @Override