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

Commit 7e410cc7 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Hide skip button when setting backup lock screen" into... 

Merge "Merge "Hide skip button when setting backup lock screen" into oc-dr1-dev am: 8218511f" into oc-dr1-dev-plus-aosp
parents 66037a6a 1fd8a6d9

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

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ public class ChooseLockPassword extends SettingsActivity { 
        private Stage mUiStage = Stage.Introduction;

        private PasswordRequirementAdapter mPasswordRequirementAdapter;

        private GlifLayout mLayout;

        private boolean mForFingerprint;

        protected boolean mForFingerprint;



        private String mFirstPin;

        private RecyclerView mPasswordRestrictionView;

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

+5 −1
Original line number Diff line number Diff line
@@ -77,7 +77,11 @@ public class SetupChooseLockPassword extends ChooseLockPassword { 
        public void onViewCreated(View view, Bundle savedInstanceState) {

            super.onViewCreated(view, savedInstanceState);



            if (mForFingerprint) {

                mCancelButton.setVisibility(View.GONE);

            } else {

                mCancelButton.setText(R.string.skip_label);

            }



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

                    ChooseLockGenericFragment.EXTRA_SHOW_OPTIONS_BUTTON, false);