commit 871e55fc54a0095f3ea5f848a7b9f9e4ee6c8d01
author Kevin Chyn <kchyn@google.com> Mon Jun 25 16:50:52 2018 -0700
committer Kevin Chyn <kchyn@google.com> Mon Jun 25 16:51:16 2018 -0700
tree 7ae16115407563fb3e6e159d465602b39aef6550
parent fde790bf2c564c81c0be2e275d68e253730ffff6

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

AndroidManifest.xml

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" />