diff options
| author | Jim Miller <jaggies@google.com> | 2015-04-02 03:09:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-02 03:09:57 +0000 |
| commit | e3107164d50cabb3be5bf936a08b296cac6a4a50 (patch) | |
| tree | 6bd203940e13a7074583c8462ae3b53672064b18 /src/com/android | |
| parent | 96c47d45e7723343cebfb440977fdb9820f07af5 (diff) | |
| parent | 595982d2c34e6b84b7d08f1c3289535c60935830 (diff) | |
| download | packages_apps_Settings-e3107164d50cabb3be5bf936a08b296cac6a4a50.tar.gz packages_apps_Settings-e3107164d50cabb3be5bf936a08b296cac6a4a50.tar.bz2 packages_apps_Settings-e3107164d50cabb3be5bf936a08b296cac6a4a50.zip | |
Merge "Prepare to make Fingerprint API public."
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/settings/ChooseLockGeneric.java | 6 | ||||
| -rw-r--r-- | src/com/android/settings/FingerprintEnroll.java | 4 | ||||
| -rw-r--r-- | src/com/android/settings/FingerprintSettings.java | 10 | ||||
| -rw-r--r-- | src/com/android/settings/SecuritySettings.java | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java index 6d31e604f..cb0ce5f8b 100644 --- a/src/com/android/settings/ChooseLockGeneric.java +++ b/src/com/android/settings/ChooseLockGeneric.java @@ -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; diff --git a/src/com/android/settings/FingerprintEnroll.java b/src/com/android/settings/FingerprintEnroll.java index c54272f98..96e612b6b 100644 --- a/src/com/android/settings/FingerprintEnroll.java +++ b/src/com/android/settings/FingerprintEnroll.java @@ -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; diff --git a/src/com/android/settings/FingerprintSettings.java b/src/com/android/settings/FingerprintSettings.java index d086ff718..c134cfbbf 100644 --- a/src/com/android/settings/FingerprintSettings.java +++ b/src/com/android/settings/FingerprintSettings.java @@ -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; diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java index df217c800..3ac2ac668 100644 --- a/src/com/android/settings/SecuritySettings.java +++ b/src/com/android/settings/SecuritySettings.java @@ -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; |