Move Fingerprint settings to biometrics/fingerprint
Bug: 110589286
Test: make -j56 RunSettingsRoboTests
Test: adb shell am start -a android.settings.FINGERPRINT_ENROLL still works
Test: adb shell am start -a android.settings.FINGERPRINT_SETUP still works
Change-Id: If33b557137cae7b57e4a0e906ee95032bc589436
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7bbffc7..50ab8bb 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1590,11 +1590,11 @@
android:windowSoftInputMode="stateHidden|adjustResize"
android:theme="@style/GlifTheme.Light"/>
- <activity android:name=".fingerprint.FingerprintSettings" android:exported="false"/>
- <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"
+ <activity android:name=".biometrics.fingerprint.FingerprintSettings" android:exported="false"/>
+ <activity android:name=".biometrics.fingerprint.FingerprintEnrollFindSensor" android:exported="false"/>
+ <activity android:name=".biometrics.fingerprint.FingerprintEnrollEnrolling" android:exported="false"/>
+ <activity android:name=".biometrics.fingerprint.FingerprintEnrollFinish" android:exported="false"/>
+ <activity android:name=".biometrics.fingerprint.FingerprintEnrollIntroduction"
android:exported="true"
android:theme="@style/GlifTheme.Light">
<intent-filter>
@@ -1603,10 +1603,10 @@
</intent-filter>
</activity>
- <activity android:name=".fingerprint.SetupFingerprintEnrollFindSensor" android:exported="false"/>
- <activity android:name=".fingerprint.SetupFingerprintEnrollEnrolling" android:exported="false"/>
- <activity android:name=".fingerprint.SetupFingerprintEnrollFinish" android:exported="false"/>
- <activity android:name=".fingerprint.SetupFingerprintEnrollIntroduction"
+ <activity android:name=".biometrics.fingerprint.SetupFingerprintEnrollFindSensor" android:exported="false"/>
+ <activity android:name=".biometrics.fingerprint.SetupFingerprintEnrollEnrolling" android:exported="false"/>
+ <activity android:name=".biometrics.fingerprint.SetupFingerprintEnrollFinish" android:exported="false"/>
+ <activity android:name=".biometrics.fingerprint.SetupFingerprintEnrollIntroduction"
android:exported="true"
android:permission="android.permission.MANAGE_FINGERPRINT"
android:theme="@style/GlifTheme.Light">
@@ -1616,7 +1616,7 @@
</intent-filter>
</activity>
- <activity android:name=".fingerprint.FingerprintSuggestionActivity"
+ <activity android:name=".biometrics.fingerprint.FingerprintSuggestionActivity"
android:exported="true"
android:permission="android.permission.MANAGE_FINGERPRINT"
android:icon="@drawable/ic_suggestion_fingerprint"
@@ -1691,7 +1691,7 @@
<meta-data android:name="com.android.settings.icon_tintable" android:value="true" />
</activity>
- <activity android:name=".fingerprint.FingerprintEnrollSuggestionActivity"
+ <activity android:name=".biometrics.fingerprint.FingerprintEnrollSuggestionActivity"
android:icon="@drawable/ic_suggestion_fingerprint">
<intent-filter android:priority="2">
<action android:name="android.intent.action.MAIN" />
diff --git a/res/layout/fingerprint_enroll_find_sensor_graphic.xml b/res/layout/fingerprint_enroll_find_sensor_graphic.xml
index 1c6ab80..0690457 100644
--- a/res/layout/fingerprint_enroll_find_sensor_graphic.xml
+++ b/res/layout/fingerprint_enroll_find_sensor_graphic.xml
@@ -28,7 +28,7 @@
android:src="@drawable/fingerprint_sensor_location"
android:scaleType="centerInside"/>
- <com.android.settings.fingerprint.FingerprintLocationAnimationView
+ <com.android.settings.biometrics.fingerprint.FingerprintLocationAnimationView
android:id="@+id/fingerprint_sensor_location_animation"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
diff --git a/src/com/android/settings/fingerprint/OWNERS b/src/com/android/settings/biometrics/OWNERS
similarity index 89%
rename from src/com/android/settings/fingerprint/OWNERS
rename to src/com/android/settings/biometrics/OWNERS
index 937b303..6332a46 100644
--- a/src/com/android/settings/fingerprint/OWNERS
+++ b/src/com/android/settings/biometrics/OWNERS
@@ -1,5 +1,6 @@
# Default reviewers for this and subdirectories.
jaggies@google.com
+kchyn@google.com
yukl@google.com
# Emergency approvers in case the above are not available
\ No newline at end of file
diff --git a/src/com/android/settings/fingerprint/FingerprintAuthenticateSidecar.java b/src/com/android/settings/biometrics/fingerprint/FingerprintAuthenticateSidecar.java
similarity index 98%
rename from src/com/android/settings/fingerprint/FingerprintAuthenticateSidecar.java
rename to src/com/android/settings/biometrics/fingerprint/FingerprintAuthenticateSidecar.java
index 1fa59a2..0b92326 100644
--- a/src/com/android/settings/fingerprint/FingerprintAuthenticateSidecar.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintAuthenticateSidecar.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import android.hardware.fingerprint.FingerprintManager;
import android.hardware.fingerprint.FingerprintManager.AuthenticationResult;
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollBase.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollBase.java
similarity index 98%
rename from src/com/android/settings/fingerprint/FingerprintEnrollBase.java
rename to src/com/android/settings/biometrics/fingerprint/FingerprintEnrollBase.java
index 5a148d3..a65ee8c 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollBase.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollBase.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import android.annotation.Nullable;
import android.content.Intent;
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
similarity index 99%
rename from src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
rename to src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
index b87e61f..2b7a20b 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import android.animation.Animator;
import android.animation.ObjectAnimator;
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
similarity index 98%
rename from src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
rename to src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
index e572982..bc01458 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import android.content.Intent;
import android.hardware.fingerprint.FingerprintManager;
@@ -27,7 +27,7 @@
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.Utils;
-import com.android.settings.fingerprint.FingerprintEnrollSidecar.Listener;
+import com.android.settings.biometrics.fingerprint.FingerprintEnrollSidecar.Listener;
import com.android.settings.password.ChooseLockSettingsHelper;
import androidx.annotation.Nullable;
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollFinish.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java
similarity index 97%
rename from src/com/android/settings/fingerprint/FingerprintEnrollFinish.java
rename to src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java
index 4bd438c..8b175ec 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollFinish.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import android.content.Intent;
import android.hardware.fingerprint.FingerprintManager;
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
similarity index 99%
rename from src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
rename to src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
index dd83121..dfcdace 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import android.app.admin.DevicePolicyManager;
import android.content.ActivityNotFoundException;
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java
similarity index 98%
rename from src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java
rename to src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java
index 7f7cb67..af56310 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import android.annotation.Nullable;
import android.app.Activity;
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivity.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSuggestionActivity.java
similarity index 95%
rename from src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivity.java
rename to src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSuggestionActivity.java
index 4a4d08d..fb2c668 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivity.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSuggestionActivity.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import android.content.Context;
diff --git a/src/com/android/settings/fingerprint/FingerprintFindSensorAnimation.java b/src/com/android/settings/biometrics/fingerprint/FingerprintFindSensorAnimation.java
similarity index 94%
rename from src/com/android/settings/fingerprint/FingerprintFindSensorAnimation.java
rename to src/com/android/settings/biometrics/fingerprint/FingerprintFindSensorAnimation.java
index 07ab99d..8ce507e 100644
--- a/src/com/android/settings/fingerprint/FingerprintFindSensorAnimation.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintFindSensorAnimation.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
/**
* An abstraction for a view that contains an animation that shows the user
diff --git a/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoView.java b/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationVideoView.java
similarity index 98%
rename from src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoView.java
rename to src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationVideoView.java
index b988ab7..c79ed49 100644
--- a/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoView.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationVideoView.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import android.content.ContentResolver;
import android.content.Context;
diff --git a/src/com/android/settings/fingerprint/FingerprintLocationAnimationView.java b/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationView.java
similarity index 98%
rename from src/com/android/settings/fingerprint/FingerprintLocationAnimationView.java
rename to src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationView.java
index 0812f2d..99d4ff9 100644
--- a/src/com/android/settings/fingerprint/FingerprintLocationAnimationView.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationView.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
diff --git a/src/com/android/settings/fingerprint/FingerprintProfileStatusPreferenceController.java b/src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceController.java
similarity index 95%
rename from src/com/android/settings/fingerprint/FingerprintProfileStatusPreferenceController.java
rename to src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceController.java
index 68d2ade..23873f9 100644
--- a/src/com/android/settings/fingerprint/FingerprintProfileStatusPreferenceController.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceController.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import android.content.Context;
import android.os.UserHandle;
diff --git a/src/com/android/settings/fingerprint/FingerprintRemoveSidecar.java b/src/com/android/settings/biometrics/fingerprint/FingerprintRemoveSidecar.java
similarity index 98%
rename from src/com/android/settings/fingerprint/FingerprintRemoveSidecar.java
rename to src/com/android/settings/biometrics/fingerprint/FingerprintRemoveSidecar.java
index 381b8eb..25cd2f5 100644
--- a/src/com/android/settings/fingerprint/FingerprintRemoveSidecar.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintRemoveSidecar.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import android.annotation.Nullable;
import android.hardware.fingerprint.Fingerprint;
diff --git a/src/com/android/settings/fingerprint/FingerprintSettings.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
similarity index 99%
rename from src/com/android/settings/fingerprint/FingerprintSettings.java
rename to src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
index 0bd926d..60e09d2 100644
--- a/src/com/android/settings/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import android.app.Activity;
diff --git a/src/com/android/settings/fingerprint/FingerprintStatusPreferenceController.java b/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceController.java
similarity index 98%
rename from src/com/android/settings/fingerprint/FingerprintStatusPreferenceController.java
rename to src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceController.java
index 2839ee6..e13e8ac 100644
--- a/src/com/android/settings/fingerprint/FingerprintStatusPreferenceController.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceController.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import android.content.Context;
import android.content.Intent;
diff --git a/src/com/android/settings/fingerprint/FingerprintSuggestionActivity.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivity.java
similarity index 97%
rename from src/com/android/settings/fingerprint/FingerprintSuggestionActivity.java
rename to src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivity.java
index fa6aeb4..f5fe92b 100644
--- a/src/com/android/settings/fingerprint/FingerprintSuggestionActivity.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivity.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import android.app.admin.DevicePolicyManager;
import android.content.Context;
diff --git a/src/com/android/settings/fingerprint/FingerprintUiHelper.java b/src/com/android/settings/biometrics/fingerprint/FingerprintUiHelper.java
similarity index 98%
rename from src/com/android/settings/fingerprint/FingerprintUiHelper.java
rename to src/com/android/settings/biometrics/fingerprint/FingerprintUiHelper.java
index 4a67ecd..012f802 100644
--- a/src/com/android/settings/fingerprint/FingerprintUiHelper.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintUiHelper.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import android.hardware.fingerprint.FingerprintManager;
import android.os.CancellationSignal;
diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollEnrolling.java
similarity index 95%
rename from src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java
rename to src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollEnrolling.java
index fbbf033..c2c4930 100644
--- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollEnrolling.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import android.content.Intent;
diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensor.java
similarity index 98%
rename from src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java
rename to src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensor.java
index 3a4c3f7..d3acbea 100644
--- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensor.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import android.app.Activity;
import android.app.AlertDialog;
diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinish.java
similarity index 96%
rename from src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java
rename to src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinish.java
index e81203f..c73417b 100644
--- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java
+++ b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinish.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import android.content.Intent;
import android.os.UserHandle;
diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java
similarity index 98%
rename from src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java
rename to src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java
index 5656a27..c7c0bb4 100644
--- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import android.app.Activity;
import android.app.KeyguardManager;
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
index f71a6bc..1d58ed5 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
@@ -28,8 +28,8 @@
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.Settings.NightDisplaySuggestionActivity;
import com.android.settings.display.NightDisplayPreferenceController;
-import com.android.settings.fingerprint.FingerprintEnrollSuggestionActivity;
-import com.android.settings.fingerprint.FingerprintSuggestionActivity;
+import com.android.settings.biometrics.fingerprint.FingerprintEnrollSuggestionActivity;
+import com.android.settings.biometrics.fingerprint.FingerprintSuggestionActivity;
import com.android.settings.notification.ZenOnboardingActivity;
import com.android.settings.notification.ZenSuggestionActivity;
import com.android.settings.overlay.FeatureFactory;
diff --git a/src/com/android/settings/password/ChooseLockGeneric.java b/src/com/android/settings/password/ChooseLockGeneric.java
index b5fb8e9..68678dc 100644
--- a/src/com/android/settings/password/ChooseLockGeneric.java
+++ b/src/com/android/settings/password/ChooseLockGeneric.java
@@ -53,8 +53,8 @@
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-import com.android.settings.fingerprint.FingerprintEnrollBase;
-import com.android.settings.fingerprint.FingerprintEnrollFindSensor;
+import com.android.settings.biometrics.fingerprint.FingerprintEnrollBase;
+import com.android.settings.biometrics.fingerprint.FingerprintEnrollFindSensor;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedPreference;
diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java b/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
index 3f26750..74207cd 100644
--- a/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
@@ -53,7 +53,7 @@
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.InstrumentedFragment;
-import com.android.settings.fingerprint.FingerprintUiHelper;
+import com.android.settings.biometrics.fingerprint.FingerprintUiHelper;
/**
* Base fragment to be shared for PIN/Pattern/Password confirmation fragments.
diff --git a/src/com/android/settings/password/SetupChooseLockGeneric.java b/src/com/android/settings/password/SetupChooseLockGeneric.java
index 4258d76..0540bbf 100644
--- a/src/com/android/settings/password/SetupChooseLockGeneric.java
+++ b/src/com/android/settings/password/SetupChooseLockGeneric.java
@@ -31,7 +31,7 @@
import com.android.settings.R;
import com.android.settings.SetupEncryptionInterstitial;
import com.android.settings.SetupWizardUtils;
-import com.android.settings.fingerprint.SetupFingerprintEnrollFindSensor;
+import com.android.settings.biometrics.fingerprint.SetupFingerprintEnrollFindSensor;
import com.android.settings.utils.SettingsDividerItemDecoration;
import com.android.setupwizardlib.GlifPreferenceLayout;
diff --git a/src/com/android/settings/security/SecuritySettings.java b/src/com/android/settings/security/SecuritySettings.java
index b590618..30ac402 100644
--- a/src/com/android/settings/security/SecuritySettings.java
+++ b/src/com/android/settings/security/SecuritySettings.java
@@ -29,8 +29,8 @@
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.enterprise.EnterprisePrivacyPreferenceController;
-import com.android.settings.fingerprint.FingerprintProfileStatusPreferenceController;
-import com.android.settings.fingerprint.FingerprintStatusPreferenceController;
+import com.android.settings.biometrics.fingerprint.FingerprintProfileStatusPreferenceController;
+import com.android.settings.biometrics.fingerprint.FingerprintStatusPreferenceController;
import com.android.settings.location.LocationPreferenceController;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.security.trustagent.ManageTrustAgentsPreferenceController;
diff --git a/tests/robotests/assets/grandfather_not_implementing_indexable b/tests/robotests/assets/grandfather_not_implementing_indexable
index 393fe61..45474e7 100644
--- a/tests/robotests/assets/grandfather_not_implementing_indexable
+++ b/tests/robotests/assets/grandfather_not_implementing_indexable
@@ -6,7 +6,7 @@
com.android.settings.datausage.DataUsageList
com.android.settings.vpn2.AppManagementFragment
com.android.settings.vpn2.VpnSettings
-com.android.settings.fingerprint.FingerprintSettings$FingerprintSettingsFragment
+com.android.settings.biometrics.fingerprint.FingerprintSettings$FingerprintSettingsFragment
com.android.settings.applications.ProcessStatsDetail
com.android.settings.wifi.WifiInfo
com.android.settings.applications.VrListenerSettings
diff --git a/tests/robotests/src/com/android/settings/fingerprint/DeleteFingerprintDialogTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/DeleteFingerprintDialogTest.java
similarity index 88%
rename from tests/robotests/src/com/android/settings/fingerprint/DeleteFingerprintDialogTest.java
rename to tests/robotests/src/com/android/settings/biometrics/fingerprint/DeleteFingerprintDialogTest.java
index d306d06..27729cf 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/DeleteFingerprintDialogTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/DeleteFingerprintDialogTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
@@ -23,8 +23,8 @@
import android.app.Dialog;
import android.hardware.fingerprint.Fingerprint;
-import com.android.settings.fingerprint.FingerprintSettings.FingerprintSettingsFragment;
-import com.android.settings.fingerprint.FingerprintSettings.FingerprintSettingsFragment.DeleteFingerprintDialog;
+import com.android.settings.biometrics.fingerprint.FingerprintSettings.FingerprintSettingsFragment;
+import com.android.settings.biometrics.fingerprint.FingerprintSettings.FingerprintSettingsFragment.DeleteFingerprintDialog;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowFragment;
diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollEnrollingTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollEnrollingTest.java
rename to tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
index 8c8113b..bee208f 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollEnrollingTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java
rename to tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java
index 1fe0931..338b3c0 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSuggestionActivityTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivityTest.java
rename to tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSuggestionActivityTest.java
index 74d4b28..888b061 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivityTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSuggestionActivityTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoViewTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationVideoViewTest.java
similarity index 97%
rename from tests/robotests/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoViewTest.java
rename to tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationVideoViewTest.java
index 24eb1ad..e8b27a8 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoViewTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationVideoViewTest.java
@@ -15,7 +15,7 @@
*
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintPreferenceTest.java
similarity index 94%
rename from tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java
rename to tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintPreferenceTest.java
index f8984ab..8c90cb7 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintPreferenceTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.verify;
@@ -25,7 +25,7 @@
import android.widget.FrameLayout;
import com.android.settings.R;
-import com.android.settings.fingerprint.FingerprintSettings.FingerprintPreference;
+import com.android.settings.biometrics.fingerprint.FingerprintSettings.FingerprintPreference;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java
index 583428e..fe3f5b0 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER;
import static com.google.common.truth.Truth.assertThat;
diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceControllerTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/fingerprint/FingerprintStatusPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceControllerTest.java
index e01ed3c..7fe114b 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintStatusPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceControllerTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/fingerprint/FingerprintSuggestionActivityTest.java
rename to tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java
index ee47f2a..310674e 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintSuggestionActivityTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import static com.google.common.truth.Truth.assertThat;
import static org.robolectric.RuntimeEnvironment.application;
diff --git a/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensorTest.java
similarity index 98%
rename from tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensorTest.java
rename to tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensorTest.java
index 85d7ad8..38127ef 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensorTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensorTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
diff --git a/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java
similarity index 97%
rename from tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java
rename to tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java
index 9e62511..bbdb443 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import static com.google.common.truth.Truth.assertThat;
import static org.robolectric.RuntimeEnvironment.application;
@@ -27,7 +27,7 @@
import android.widget.Button;
import com.android.settings.R;
-import com.android.settings.fingerprint.SetupFingerprintEnrollIntroductionTest.ShadowStorageManagerWrapper;
+import com.android.settings.biometrics.fingerprint.SetupFingerprintEnrollIntroductionTest.ShadowStorageManagerWrapper;
import com.android.settings.password.SetupChooseLockGeneric.SetupChooseLockGenericFragment;
import com.android.settings.password.SetupSkipDialog;
import com.android.settings.password.StorageManagerWrapper;
diff --git a/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java b/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
index a6acf27..38d9ce5 100644
--- a/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
+++ b/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
@@ -28,8 +28,8 @@
import com.android.settings.R;
import com.android.settings.Settings;
-import com.android.settings.fingerprint.FingerprintEnrollSuggestionActivity;
-import com.android.settings.fingerprint.FingerprintSuggestionActivity;
+import com.android.settings.biometrics.fingerprint.FingerprintEnrollSuggestionActivity;
+import com.android.settings.biometrics.fingerprint.FingerprintSuggestionActivity;
import com.android.settings.notification.ZenSuggestionActivity;
import com.android.settings.support.NewDeviceIntroSuggestionActivity;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
diff --git a/tests/unit/src/com/android/settings/fingerprint/FingerprintEnrollFinishTest.java b/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinishTest.java
similarity index 98%
rename from tests/unit/src/com/android/settings/fingerprint/FingerprintEnrollFinishTest.java
rename to tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinishTest.java
index b09d1bf..da25ac0 100644
--- a/tests/unit/src/com/android/settings/fingerprint/FingerprintEnrollFinishTest.java
+++ b/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinishTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import static android.support.test.InstrumentationRegistry.getTargetContext;
import static android.support.test.espresso.Espresso.onView;
diff --git a/tests/unit/src/com/android/settings/fingerprint/FingerprintEnrollIntroductionTest.java b/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroductionTest.java
similarity index 98%
rename from tests/unit/src/com/android/settings/fingerprint/FingerprintEnrollIntroductionTest.java
rename to tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroductionTest.java
index 235ba1e..e937b7f 100644
--- a/tests/unit/src/com/android/settings/fingerprint/FingerprintEnrollIntroductionTest.java
+++ b/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroductionTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.fingerprint;
+package com.android.settings.biometrics.fingerprint;
import static org.mockito.Matchers.anyInt;