Merge "Hide skip button when setting backup lock screen" into oc-dr1-dev

2017-07-06 22:08:51 +00:00
parent 55ad60d1ff 562e539516
commit 8218511fb7
2 changed files with 6 additions and 2 deletions
--- a/src/com/android/settings/password/SetupChooseLockPassword.java
+++ b/src/com/android/settings/password/SetupChooseLockPassword.java
@@ -77,7 +77,11 @@ public class SetupChooseLockPassword extends ChooseLockPassword {
        public void onViewCreated(View view, Bundle 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(
                    ChooseLockGenericFragment.EXTRA_SHOW_OPTIONS_BUTTON, false);