Skip option missing on pattern lock screen
- Skip present during suw/deferred + non-fingerprint flow - Skip hidden when opened from settings - Skip hidden during suw/deferred when trying to setup up fingerprint Test: Manually verified, robolectric tests updated bug: 71763670 Change-Id: Ie3aac68a6d04c7727320af83532640580248bd47
This commit is contained in:
@@ -22,6 +22,7 @@ import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
import android.view.View;
|
||||
import android.widget.Button;
|
||||
import android.widget.TextView;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.SetupRedactionInterstitial;
|
||||
@@ -71,6 +72,24 @@ public class SetupChooseLockPattern extends ChooseLockPattern {
|
||||
startChooseLockActivity(lock, getActivity());
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void updateFooterLeftButton(Stage stage, TextView footerLeftButton) {
|
||||
super.updateFooterLeftButton(stage, footerLeftButton);
|
||||
// enable skip button only during setupwizard and not with fingerprint flow.
|
||||
if (!mForFingerprint) {
|
||||
footerLeftButton.setVisibility(View.VISIBLE);
|
||||
footerLeftButton.setText(R.string.skip_label);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void handleLeftButton() {
|
||||
SetupSkipDialog dialog = SetupSkipDialog.newInstance(
|
||||
getActivity().getIntent()
|
||||
.getBooleanExtra(SetupSkipDialog.EXTRA_FRP_SUPPORTED, false));
|
||||
dialog.show(getFragmentManager());
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Intent getRedactionInterstitialIntent(Context context) {
|
||||
// Setup wizard's redaction interstitial is deferred to optional step. Enable that
|
||||
|
Reference in New Issue
Block a user