Added an introduction to the fingerprint enrollment

Bug: 21468315
Change-Id: Ieb691b0e321f44b9bae2f4f8dfd458c24b98a8d9

src/com/android/settings/SecuritySettings.java

@@ -17,8 +17,6 @@
 package com.android.settings;
 
 
-import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
-
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.admin.DevicePolicyManager;
@@ -54,8 +52,7 @@ import android.util.Log;
 import com.android.internal.logging.MetricsLogger;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.TrustAgentUtils.TrustAgentComponentInfo;
-import com.android.settings.fingerprint.FingerprintEnrollFindSensor;
-import com.android.settings.fingerprint.FingerprintEnrollOnboard;
+import com.android.settings.fingerprint.FingerprintEnrollIntroduction;
 import com.android.settings.fingerprint.FingerprintSettings;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Index;
@@ -65,6 +62,8 @@ import com.android.settings.search.SearchIndexableRaw;
 import java.util.ArrayList;
 import java.util.List;
 
+import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
+
 /**
  * Gesture lock pattern settings.
  */
@@ -358,12 +357,9 @@ public class SecuritySettings extends SettingsPreferenceFragment
                     R.plurals.security_settings_fingerprint_preference_summary,
                     fingerprintCount, fingerprintCount));
             clazz = FingerprintSettings.class.getName();
-        } else if (!hasPassword) {
-            // No fingerprints registered, launch into enrollment wizard.
-            clazz = FingerprintEnrollOnboard.class.getName();
         } else {
-            // Lock thingy is already set up, launch directly into find sensor step from wizard.
-            clazz = FingerprintEnrollFindSensor.class.getName();
+            clazz = FingerprintEnrollIntroduction.class.getName();
+            intent.putExtra(FingerprintEnrollIntroduction.EXTRA_HAS_PASSWORD, hasPassword);
         }
         intent.setClassName("com.android.settings", clazz);
         fingerprintPreference.setIntent(intent);

src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java

@@ -73,6 +73,7 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase {
             }
         } else if (requestCode == ENROLLING) {
             if (resultCode == RESULT_FINISHED) {
+                setResult(RESULT_FINISHED);
                 finish();
             }
         } else {

src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java

@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings.fingerprint;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+
+import com.android.settings.HelpUtils;
+import com.android.settings.R;
+
+/**
+ * Onboarding activity for fingerprint enrollment.
+ */
+public class FingerprintEnrollIntroduction extends FingerprintEnrollBase {
+
+    public static final String EXTRA_HAS_PASSWORD = "fp_existing_password";
+    private boolean mHasPassword;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.fingerprint_enroll_introduction);
+        setHeaderText(R.string.security_settings_fingerprint_enroll_introduction_title);
+        findViewById(R.id.cancel_button).setOnClickListener(this);
+        findViewById(R.id.learn_more_button).setOnClickListener(this);
+        mHasPassword = getIntent().getBooleanExtra(EXTRA_HAS_PASSWORD, false);
+    }
+
+    @Override
+    protected void onNextButtonClick() {
+        Intent intent = new Intent();
+        final String clazz;
+        if (!mHasPassword) {
+            // No fingerprints registered, launch into enrollment wizard.
+            clazz = FingerprintEnrollOnboard.class.getName();
+        } else {
+            // Lock thingy is already set up, launch directly into find sensor step from wizard.
+            clazz = FingerprintEnrollFindSensor.class.getName();
+        }
+        intent.setClassName("com.android.settings", clazz);
+        startActivityForResult(intent, 0);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (resultCode == RESULT_FINISHED) {
+            finish();
+        } else {
+            super.onActivityResult(requestCode, resultCode, data);
+        }
+    }
+
+    @Override
+    public void onClick(View v) {
+        if (v.getId() == R.id.cancel_button) {
+            finish();
+        }
+        if (v.getId() == R.id.learn_more_button) {
+            launchFingerprintHelp();
+        }
+        super.onClick(v);
+    }
+
+    private void launchFingerprintHelp() {
+        Intent helpIntent = HelpUtils.getHelpIntent(this,
+                getString(R.string.help_url_fingerprint), getClass().getName());
+        startActivity(helpIntent);
+    }
+}

src/com/android/settings/fingerprint/FingerprintEnrollOnboard.java

@@ -49,6 +49,7 @@ public class FingerprintEnrollOnboard extends FingerprintEnrollBase {
         if (requestCode == CHOOSE_LOCK_GENERIC_REQUEST && resultCode == RESULT_FINISHED) {
             byte[] token = data.getByteArrayExtra(
                     ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
+            setResult(RESULT_FINISHED);
             launchFindSensor(token);
         } else {
             super.onActivityResult(requestCode, resultCode, data);