Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3107164 authored Apr 02, 2015 by Jim Miller Committed by Android (Google) Code Review Apr 02, 2015

Merge "Prepare to make Fingerprint API public."

parents 96c47d45 595982d2

src/com/android/settings/ChooseLockGeneric.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -34,9 +34,9 @@ import android.os.UserManager;
		import android.preference.Preference;
		import android.preference.PreferenceScreen;
		import android.security.KeyStore;
		import android.service.fingerprint.Fingerprint;
		import android.service.fingerprint.FingerprintManager;
		import android.service.fingerprint.FingerprintManager.RemovalCallback;
		import android.hardware.fingerprint.Fingerprint;
		import android.hardware.fingerprint.FingerprintManager;
		import android.hardware.fingerprint.FingerprintManager.RemovalCallback;
		import android.util.EventLog;
		import android.util.Log;
		import android.view.accessibility.AccessibilityManager;

src/com/android/settings/FingerprintEnroll.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -32,8 +32,8 @@ import android.os.CancellationSignal;
		import android.os.PowerManager;
		import android.os.SystemClock;
		import android.os.Vibrator;
		import android.service.fingerprint.FingerprintManager;
		import android.service.fingerprint.FingerprintManager.EnrollmentCallback;
		import android.hardware.fingerprint.FingerprintManager;
		import android.hardware.fingerprint.FingerprintManager.EnrollmentCallback;
		import android.util.Log;
		import android.view.LayoutInflater;
		import android.view.View;

src/com/android/settings/FingerprintSettings.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -29,11 +29,11 @@ import android.preference.Preference;
		import android.preference.Preference.OnPreferenceChangeListener;
		import android.preference.PreferenceGroup;
		import android.preference.PreferenceScreen;
		import android.service.fingerprint.Fingerprint;
		import android.service.fingerprint.FingerprintManager;
		import android.service.fingerprint.FingerprintManager.AuthenticationCallback;
		import android.service.fingerprint.FingerprintManager.RemovalCallback;
		import android.service.fingerprint.FingerprintManager.AuthenticationResult;
		import android.hardware.fingerprint.Fingerprint;
		import android.hardware.fingerprint.FingerprintManager;
		import android.hardware.fingerprint.FingerprintManager.AuthenticationCallback;
		import android.hardware.fingerprint.FingerprintManager.RemovalCallback;
		import android.hardware.fingerprint.FingerprintManager.AuthenticationResult;
		import android.util.AttributeSet;
		import android.util.Log;
		import android.view.View;

src/com/android/settings/SecuritySettings.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -40,8 +40,8 @@ import android.preference.PreferenceScreen;
		import android.provider.SearchIndexableResource;
		import android.provider.Settings;
		import android.security.KeyStore;
		import android.service.fingerprint.Fingerprint;
		import android.service.fingerprint.FingerprintManager;
		import android.hardware.fingerprint.Fingerprint;
		import android.hardware.fingerprint.FingerprintManager;
		import android.service.trust.TrustAgentService;
		import android.telephony.TelephonyManager;
		import android.telephony.SubscriptionManager;