Since the SetupChooseLockPattern include header icon header title, header sub-title, pattern state description, LockPatternView and FooterBar, there was a limited room for LockPatternView especially in the confirm steps which both header title and pattern description occupy 2 lines space. Hance the PatternView size used to inconsistence in-between 1st draw and 2nd confirm draw, besides it's visual looks jumping and small on some device which have smaller display. This solution includes 3 changes: 1. Organized the pattern view message to leverage header sub-title view, then we can resever more space. (Set minHeight=2 for sub-title) 2. Set screen_lock_options button visibilty to GONE when the stage in 2nd confirmation.(Previously it's INVISIBLE and reserve additional space) 3. Let LockPatternView align bottom of FrameLayout to prevent the view juming and flicker. 4. Clean up unused forAnyBiometric flag and code. 5. GlifLayout.getDescriptionTextView() == mHeaderView Need setDescriptionText() to make the view from GONE -> VISIBLE 6. Polish the stage flow and ensure IntroductionStage show correct message 7. Add ChooseLockPattern into embeded activity white list Force show ChooseLockPattern in fullscreen in case the Pattern view truncated in `NeedToConfirmStage` where the title showing 2 lines and push pattern view down, and get bad UX in the device which integrate a shorter display. 8. Add test cases for all stage and polish legacy test code. Test: make RunSettingsRoboTests ROBOTEST_FILTER= \ "com.android.settings.password.SetupChooseLockPatternTest" Test: make RunSettingsRoboTests ROBOTEST_FILTER= \ "com.android.settings.password.ChooseLockPatternTest" Bug: 249974175 Bug: 260027850 Change-Id: I868af9b14ba99af5d78a05f6c2a570ccc07aea15
165 lines
6.8 KiB
Java
165 lines
6.8 KiB
Java
/*
|
|
* Copyright (C) 2014 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
package com.android.settings.password;
|
|
|
|
import static android.content.res.Configuration.ORIENTATION_LANDSCAPE;
|
|
|
|
import android.content.Context;
|
|
import android.content.Intent;
|
|
import android.os.Bundle;
|
|
import android.view.LayoutInflater;
|
|
import android.view.View;
|
|
import android.view.ViewGroup;
|
|
import android.widget.Button;
|
|
|
|
import androidx.annotation.Nullable;
|
|
import androidx.fragment.app.Fragment;
|
|
|
|
import com.android.settings.R;
|
|
import com.android.settings.SetupRedactionInterstitial;
|
|
|
|
/**
|
|
* Setup Wizard's version of ChooseLockPattern screen. It inherits the logic and basic structure
|
|
* from ChooseLockPattern class, and should remain similar to that behaviorally. This class should
|
|
* only overload base methods for minor theme and behavior differences specific to Setup Wizard.
|
|
* Other changes should be done to ChooseLockPattern class instead and let this class inherit
|
|
* those changes.
|
|
*/
|
|
public class SetupChooseLockPattern extends ChooseLockPattern {
|
|
|
|
public static Intent modifyIntentForSetup(Context context, Intent chooseLockPatternIntent) {
|
|
chooseLockPatternIntent.setClass(context, SetupChooseLockPattern.class);
|
|
return chooseLockPatternIntent;
|
|
}
|
|
|
|
@Override
|
|
protected boolean isValidFragment(String fragmentName) {
|
|
return SetupChooseLockPatternFragment.class.getName().equals(fragmentName);
|
|
}
|
|
|
|
@Override
|
|
/* package */ Class<? extends Fragment> getFragmentClass() {
|
|
return SetupChooseLockPatternFragment.class;
|
|
}
|
|
|
|
@Override
|
|
protected void onCreate(Bundle savedInstanceState) {
|
|
super.onCreate(savedInstanceState);
|
|
|
|
// Show generic pattern title when pattern lock screen launch in Setup wizard flow before
|
|
// fingerprint and face setup.
|
|
setTitle(R.string.lockpassword_choose_your_pattern_header);
|
|
}
|
|
|
|
public static class SetupChooseLockPatternFragment extends ChooseLockPatternFragment
|
|
implements ChooseLockTypeDialogFragment.OnLockTypeSelectedListener {
|
|
|
|
private static final String TAG_SKIP_SCREEN_LOCK_DIALOG = "skip_screen_lock_dialog";
|
|
|
|
@Nullable
|
|
private Button mOptionsButton;
|
|
private boolean mLeftButtonIsSkip;
|
|
|
|
@Override
|
|
public View onCreateView(
|
|
LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
|
View view = super.onCreateView(inflater, container, savedInstanceState);
|
|
if (!getResources().getBoolean(R.bool.config_lock_pattern_minimal_ui)) {
|
|
mOptionsButton = view.findViewById(R.id.screen_lock_options);
|
|
mOptionsButton.setOnClickListener((btn) ->
|
|
ChooseLockTypeDialogFragment.newInstance(mUserId)
|
|
.show(getChildFragmentManager(), TAG_SKIP_SCREEN_LOCK_DIALOG));
|
|
}
|
|
// Show the skip button during SUW but not during Settings > Biometric Enrollment
|
|
mSkipOrClearButton.setOnClickListener(this::onSkipOrClearButtonClick);
|
|
return view;
|
|
}
|
|
|
|
@Override
|
|
protected void onSkipOrClearButtonClick(View view) {
|
|
if (mLeftButtonIsSkip) {
|
|
final Intent intent = getActivity().getIntent();
|
|
final boolean frpSupported = intent
|
|
.getBooleanExtra(SetupSkipDialog.EXTRA_FRP_SUPPORTED, false);
|
|
final boolean forFingerprint = intent
|
|
.getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, false);
|
|
final boolean forFace = intent
|
|
.getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FACE, false);
|
|
final boolean forBiometrics = intent
|
|
.getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_BIOMETRICS, false);
|
|
|
|
final SetupSkipDialog dialog = SetupSkipDialog.newInstance(
|
|
frpSupported,
|
|
/* isPatternMode= */ true,
|
|
/* isAlphaMode= */ false,
|
|
forFingerprint,
|
|
forFace,
|
|
forBiometrics);
|
|
dialog.show(getFragmentManager());
|
|
return;
|
|
}
|
|
super.onSkipOrClearButtonClick(view);
|
|
}
|
|
|
|
@Override
|
|
public void onLockTypeSelected(ScreenLockType lock) {
|
|
if (ScreenLockType.PATTERN == lock) {
|
|
return;
|
|
}
|
|
startChooseLockActivity(lock, getActivity());
|
|
}
|
|
|
|
private boolean showMinimalUi() {
|
|
return getResources().getBoolean(R.bool.config_lock_pattern_minimal_ui);
|
|
}
|
|
|
|
@Override
|
|
protected void updateStage(Stage stage) {
|
|
super.updateStage(stage);
|
|
if (!showMinimalUi() && mOptionsButton != null) {
|
|
// In landscape, keep view stub to avoid pattern view shifting, but in portrait the
|
|
// header title and description could become multiple lines in confirm stage,
|
|
// gone the button view to reserve more room for growth height of header.
|
|
@View.Visibility
|
|
final int hideOrGone =
|
|
getResources().getConfiguration().orientation == ORIENTATION_LANDSCAPE
|
|
? View.INVISIBLE : View.GONE;
|
|
mOptionsButton.setVisibility(
|
|
(stage == Stage.Introduction || stage == Stage.HelpScreen ||
|
|
stage == Stage.ChoiceTooShort || stage == Stage.FirstChoiceValid)
|
|
? View.VISIBLE : hideOrGone);
|
|
}
|
|
|
|
if (stage.leftMode == LeftButtonMode.Gone && stage == Stage.Introduction) {
|
|
mSkipOrClearButton.setVisibility(View.VISIBLE);
|
|
mSkipOrClearButton.setText(getActivity(), R.string.skip_label);
|
|
mLeftButtonIsSkip = true;
|
|
} else {
|
|
mLeftButtonIsSkip = false;
|
|
}
|
|
}
|
|
|
|
@Override
|
|
protected Intent getRedactionInterstitialIntent(Context context) {
|
|
// Setup wizard's redaction interstitial is deferred to optional step. Enable that
|
|
// optional step if the lock screen was set up.
|
|
SetupRedactionInterstitial.setEnabled(context, true);
|
|
return null;
|
|
}
|
|
}
|
|
}
|