Merge "Fixed the layout for the fingerprint renaming" into mnc-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3367345..8aac7d4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1434,7 +1434,14 @@
<activity android:name=".fingerprint.FingerprintEnrollFindSensor" android:exported="false"/>
<activity android:name=".fingerprint.FingerprintEnrollEnrolling" android:exported="false"/>
<activity android:name=".fingerprint.FingerprintEnrollFinish" android:exported="false"/>
- <activity android:name=".fingerprint.FingerprintEnrollIntroduction" android:exported="false"/>
+ <activity android:name=".fingerprint.FingerprintEnrollIntroduction"
+ android:exported="true"
+ android:permission="android.permission.MANAGE_FINGERPRINT">
+ <intent-filter>
+ <action android:name="android.settings.FINGERPRINT_SETUP" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ </activity>
<!-- Note this must not be exported since it returns the password in the intent -->
<activity android:name="ConfirmLockPattern$InternalActivity"
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index b41d70f..bf091f6 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -355,9 +355,6 @@
final List<Fingerprint> items = fpm.getEnrolledFingerprints();
final int fingerprintCount = items != null ? items.size() : 0;
final String clazz;
- boolean hasPassword = mChooseLockSettingsHelper.utils().getActivePasswordQuality(
- MY_USER_ID)
- != DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
if (fingerprintCount > 0) {
fingerprintPreference.setSummary(getResources().getQuantityString(
R.plurals.security_settings_fingerprint_preference_summary,
@@ -365,7 +362,6 @@
clazz = FingerprintSettings.class.getName();
} else {
clazz = FingerprintEnrollIntroduction.class.getName();
- intent.putExtra(FingerprintEnrollIntroduction.EXTRA_HAS_PASSWORD, hasPassword);
}
intent.setClassName("com.android.settings", clazz);
fingerprintPreference.setIntent(intent);
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
index a488358..d656d24 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
@@ -16,10 +16,13 @@
package com.android.settings.fingerprint;
+import android.app.admin.DevicePolicyManager;
import android.content.Intent;
import android.os.Bundle;
+import android.os.UserHandle;
import android.view.View;
+import com.android.settings.ChooseLockSettingsHelper;
import com.android.settings.HelpUtils;
import com.android.settings.R;
@@ -28,7 +31,6 @@
*/
public class FingerprintEnrollIntroduction extends FingerprintEnrollBase {
- public static final String EXTRA_HAS_PASSWORD = "fp_existing_password";
private boolean mHasPassword;
@Override
@@ -38,7 +40,9 @@
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);
+ final int passwordQuality = new ChooseLockSettingsHelper(this).utils()
+ .getActivePasswordQuality(UserHandle.myUserId());
+ mHasPassword = passwordQuality != DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
}
@Override