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

Merge "Merge "Hide skip button when setting backup lock screen" into oc-dr1-dev am: 8218511fb7" into oc-dr1-dev-plus-aosp

Browse Source 
am: 7e410cc787

Change-Id: Icec778e5dc5095ebeea441b75cc41a662f70cb32
This commit is contained in:
Maurice Lam
2017-07-06 22:33:59 +00:00
committed by android-build-merger
parent 0f65bff283 7e410cc787
commit f43bbee2cb
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/password/ChooseLockPassword.java
View File

@@ -204,7 +204,7 @@ public class ChooseLockPassword extends SettingsActivity {
private Stage mUiStage = Stage.Introduction; private Stage mUiStage = Stage.Introduction;
private PasswordRequirementAdapter mPasswordRequirementAdapter; private PasswordRequirementAdapter mPasswordRequirementAdapter;
private GlifLayout mLayout; private GlifLayout mLayout;
private boolean mForFingerprint; protected boolean mForFingerprint;
private String mFirstPin; private String mFirstPin;
private RecyclerView mPasswordRestrictionView; private RecyclerView mPasswordRestrictionView;

6
src/com/android/settings/password/SetupChooseLockPassword.java
View File

@@ -77,7 +77,11 @@ public class SetupChooseLockPassword extends ChooseLockPassword {
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); if (mForFingerprint) {
mCancelButton.setVisibility(View.GONE);
} else {
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);