Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c930fc2 authored by Maurice Lam's avatar Maurice Lam
Browse files

Allow skipping PIN setup screen 

So that setup wizard can show PIN option by default.

Test: Added Robolectric and instrumentation tests
Bug: 38509560
Change-Id: Id72744dd444b9b026ca5f28f230bae3bec254b2f
(cherry picked from commit 0f897d79)
parent ea46967c

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

+3 −4
Original line number Original line Diff line number Diff line
@@ -28,9 +28,9 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; 
import com.android.internal.widget.LockPatternUtils;

import com.android.internal.widget.LockPatternUtils;

import com.android.settings.R;

import com.android.settings.R;

import com.android.settings.SetupWizardUtils;

import com.android.settings.SetupWizardUtils;

import com.android.settings.password.ChooseLockGeneric;

import com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment;

import com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment;

import com.android.settings.password.SetupChooseLockGeneric;

import com.android.settings.password.SetupChooseLockGeneric;

import com.android.settings.password.SetupSkipDialog;





public class SetupFingerprintEnrollIntroduction extends FingerprintEnrollIntroduction {

public class SetupFingerprintEnrollIntroduction extends FingerprintEnrollIntroduction {
@@ -98,9 +98,8 @@ public class SetupFingerprintEnrollIntroduction extends FingerprintEnrollIntrodu 
            setResult(RESULT_SKIP);

            setResult(RESULT_SKIP);

            finish();

            finish();

        } else {

        } else {

            SetupSkipDialog dialog = SetupSkipDialog.newInstance(

            setResult(SetupSkipDialog.RESULT_SKIP);

                    getIntent().getBooleanExtra(SetupSkipDialog.EXTRA_FRP_SUPPORTED, false));

            finish();

            dialog.show(getFragmentManager());

        }

        }

    }

    }

src/com/android/settings/password/ChooseLockPassword.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -201,7 +201,7 @@ public class ChooseLockPassword extends SettingsActivity { 
        private String mFirstPin;

        private String mFirstPin;

        private RecyclerView mPasswordRestrictionView;

        private RecyclerView mPasswordRestrictionView;

        protected boolean mIsAlphaMode;

        protected boolean mIsAlphaMode;

        private Button mCancelButton;

        protected Button mCancelButton;

        private Button mNextButton;

        private Button mNextButton;





        private TextChangedHandler mTextChangedHandler;

        private TextChangedHandler mTextChangedHandler;

src/com/android/settings/password/SetupChooseLockGeneric.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -35,7 +35,6 @@ import com.android.settings.R; 
import com.android.settings.SetupEncryptionInterstitial;

import com.android.settings.SetupEncryptionInterstitial;

import com.android.settings.SetupWizardUtils;

import com.android.settings.SetupWizardUtils;

import com.android.settings.fingerprint.SetupFingerprintEnrollFindSensor;

import com.android.settings.fingerprint.SetupFingerprintEnrollFindSensor;

import com.android.settings.fingerprint.SetupSkipDialog;

import com.android.settings.utils.SettingsDividerItemDecoration;

import com.android.settings.utils.SettingsDividerItemDecoration;

import com.android.setupwizardlib.GlifPreferenceLayout;

import com.android.setupwizardlib.GlifPreferenceLayout;

src/com/android/settings/password/SetupChooseLockPassword.java

+9 −0
Original line number Original line Diff line number Diff line
@@ -84,6 +84,9 @@ public class SetupChooseLockPassword extends ChooseLockPassword { 
        @Override

        @Override

        public void onViewCreated(View view, Bundle savedInstanceState) {

        public void onViewCreated(View view, Bundle savedInstanceState) {

            super.onViewCreated(view, savedInstanceState);

            super.onViewCreated(view, savedInstanceState);



            mCancelButton.setText(R.string.skip_label);



            boolean showOptionsButton = getActivity().getIntent().getBooleanExtra(

            boolean showOptionsButton = getActivity().getIntent().getBooleanExtra(

                    ChooseLockGenericFragment.EXTRA_SHOW_OPTIONS_BUTTON, false);

                    ChooseLockGenericFragment.EXTRA_SHOW_OPTIONS_BUTTON, false);

            if (showOptionsButton) {

            if (showOptionsButton) {
@@ -99,6 +102,12 @@ public class SetupChooseLockPassword extends ChooseLockPassword { 
                case R.id.screen_lock_options:

                case R.id.screen_lock_options:

                    launchChooseLockGeneric();

                    launchChooseLockGeneric();

                    break;

                    break;

                case R.id.cancel_button:

                    SetupSkipDialog dialog = SetupSkipDialog.newInstance(

                            getActivity().getIntent()

                                    .getBooleanExtra(SetupSkipDialog.EXTRA_FRP_SUPPORTED, false));

                    dialog.show(getFragmentManager());

                    break;

                default:

                default:

                    super.onClick(v);

                    super.onClick(v);

            }

            }

src/com/android/settings/fingerprint/SetupSkipDialog.java→src/com/android/settings/password/SetupSkipDialog.java

+2 −3
Original line number Original line Diff line number Diff line
@@ -14,12 +14,11 @@ 
 * limitations under the License

 * limitations under the License

 */

 */





package com.android.settings.fingerprint;

package com.android.settings.password;





import android.app.Activity;

import android.app.Activity;

import android.app.AlertDialog;

import android.app.AlertDialog;

import android.app.Dialog;

import android.app.Dialog;

import android.app.DialogFragment;

import android.app.FragmentManager;

import android.app.FragmentManager;

import android.content.DialogInterface;

import android.content.DialogInterface;

import android.os.Bundle;

import android.os.Bundle;
@@ -36,7 +35,7 @@ public class SetupSkipDialog extends InstrumentedDialogFragment 




    private static final String ARG_FRP_SUPPORTED = "frp_supported";

    private static final String ARG_FRP_SUPPORTED = "frp_supported";

    private static final String TAG_SKIP_DIALOG = "skip_dialog";

    private static final String TAG_SKIP_DIALOG = "skip_dialog";

    private static final int RESULT_SKIP = Activity.RESULT_FIRST_USER + 10;

    public static final int RESULT_SKIP = Activity.RESULT_FIRST_USER + 10;





    public static SetupSkipDialog newInstance(boolean isFrpSupported) {

    public static SetupSkipDialog newInstance(boolean isFrpSupported) {

        SetupSkipDialog dialog = new SetupSkipDialog();

        SetupSkipDialog dialog = new SetupSkipDialog();