Merge "Plumb setRequireConfirmation to CC"

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

@@ -43,6 +43,7 @@ public class BiometricFragment extends InstrumentedFragment {
     private static final String KEY_SUBTITLE = "subtitle";
     private static final String KEY_DESCRIPTION = "description";
     private static final String KEY_NEGATIVE_TEXT = "negative_text";
+    private static final String KEY_REQUIRE_CONFIRMATION = "require_confirmation";
 
     // Re-set by the application. Should be done upon orientation changes, etc
     private Executor mClientExecutor;
@@ -127,6 +128,7 @@ public class BiometricFragment extends InstrumentedFragment {
             .setDescription(mPromptInfo.getDescription())
             .setNegativeButton(mPromptInfo.getNegativeButtonText(), mClientExecutor,
                     mNegativeButtonListener)
+            .setRequireConfirmation(mPromptInfo.getRequireConfirmation())
             .build();
         mCancellationSignal = new CancellationSignal();
 
@@ -171,6 +173,10 @@ public class BiometricFragment extends InstrumentedFragment {
             return mBundle.getCharSequence(KEY_NEGATIVE_TEXT);
         }
 
+        public boolean getRequireConfirmation() {
+            return mBundle.getBoolean(KEY_REQUIRE_CONFIRMATION);
+        }
+
         public static class Builder {
             private final Bundle mBundle = new Bundle();
 
@@ -194,6 +200,11 @@ public class BiometricFragment extends InstrumentedFragment {
                 return this;
             }
 
+            public Builder setRequireConfirmation(boolean requireConfirmation) {
+                mBundle.putBoolean(KEY_REQUIRE_CONFIRMATION, requireConfirmation);
+                return this;
+            }
+
             public PromptInfo build() {
                 return new PromptInfo(mBundle);
             }