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

am: 8218511fb7

Change-Id: I48b40d6158f4ebeaaaef6b8d2baf72bf8edf226a

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

@@ -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

@@ -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);