Disable SmartLock saving when SmartLock is off.

Change-Id: I69bb08940fd94d75994e66d9a2aa83254b7cc4cb

Author: samtstern

auth/src/main/java/com/firebase/ui/auth/ui/ExtraConstants.java

@@ -27,4 +27,5 @@ public class ExtraConstants {
     public static final String EXTRA_PROFILE_PICTURE_URI = "extra_profile_picture_uri";
     public static final String EXTRA_PROVIDER = "extra_provider";
     public static final String EXTRA_SUCCESS = "success_extra";
+    public static final String EXTRA_SMARTLOCK_ENABLED = "extra_smartlock_enabled";
 }

auth/src/main/java/com/firebase/ui/auth/ui/account_link/SaveCredentialsActivity.java

@@ -60,11 +60,19 @@ public class SaveCredentialsActivity extends AppCompatBase
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.save_credentials_layout);
+
+        // If SmartLock is not enabled, finish immediately
+        if (!getIntent().getBooleanExtra(ExtraConstants.EXTRA_SMARTLOCK_ENABLED, true)) {
+            finish(RESULT_OK, getIntent());
+            return;
+        }
+
         if (!FirebaseAuthWrapperFactory.getFirebaseAuthWrapper(mActivityHelper.getAppName())
                 .isPlayServicesAvailable(this)) {
             finish(RESULT_FIRST_USER, getIntent());
             return;
         }
+
         mName = getIntent().getStringExtra(ExtraConstants.EXTRA_NAME);
         mEmail = getIntent().getStringExtra(ExtraConstants.EXTRA_EMAIL);
         mPassword = getIntent().getStringExtra(ExtraConstants.EXTRA_PASSWORD);
@@ -217,6 +225,7 @@ public static Intent createIntent(
                 .putExtra(ExtraConstants.EXTRA_EMAIL, email)
                 .putExtra(ExtraConstants.EXTRA_PASSWORD, password)
                 .putExtra(ExtraConstants.EXTRA_PROVIDER, provider)
-                .putExtra(ExtraConstants.EXTRA_PROFILE_PICTURE_URI, profilePictureUri);
+                .putExtra(ExtraConstants.EXTRA_PROFILE_PICTURE_URI, profilePictureUri)
+                .putExtra(ExtraConstants.EXTRA_SMARTLOCK_ENABLED, flowParams.smartLockEnabled);
     }
 }

auth/src/main/java/com/firebase/ui/auth/util/EmailFlowUtil.java

@@ -13,7 +13,7 @@
 public class EmailFlowUtil {
 
     /**
-     * Return and intent for either {@link EmailHintContainerActivity} or
+     * Return an intent for either {@link EmailHintContainerActivity} or
      * {@link SignInNoPasswordActivity} depending on if SmartLock is enabled.
      */
     public static Intent createIntent(Context context, FlowParameters parameters) {