commit 22b4edd79ee19b84c09c74ec5d32ddfc3d12cc87
author Kevin Chyn <kchyn@google.com> Mon Jul 30 19:20:01 2018 -0700
committer Kevin Chyn <kchyn@google.com> Thu Aug 09 16:25:58 2018 -0700
tree 0fc5575db50d68e84e2b56890eed16d3b6967875
parent 6c00b9465266727a0eb61c0d1320f0e564b39c51

6/n: Add camera preview to FaceEnrollEnrolling

Bug: 112005540

Test: manual
Change-Id: Ie4f810dffecdec9731e20d5756854d9c9f420f4b

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0a5f24b..51de802 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -94,6 +94,7 @@
     <uses-permission android:name="android.permission.TEST_BLACKLISTED_PASSWORD" />
     <uses-permission android:name="android.permission.USE_RESERVED_DISK" />
     <uses-permission android:name="android.permission.MANAGE_SCOPED_ACCESS_DIRECTORY_PERMISSIONS" />
+    <uses-permission android:name="android.permission.CAMERA" />
 
     <application android:label="@string/settings_label"
             android:icon="@drawable/ic_launcher_settings"
@@ -1576,9 +1577,17 @@
             android:windowSoftInputMode="stateHidden|adjustResize"
             android:theme="@style/GlifTheme.Light"/>
 
-        <activity android:name=".biometrics.face.FaceEnrollIntroduction" android:exported="false" />
-        <activity android:name=".biometrics.face.FaceEnrollEnrolling" android:exported="false" />
-        <activity android:name=".biometrics.face.FaceEnrollFinish" android:exported="false" />
+        <activity android:name=".biometrics.face.FaceEnrollIntroduction"
+            android:exported="false"
+            android:screenOrientation="portrait"/>
+
+        <activity android:name=".biometrics.face.FaceEnrollEnrolling"
+            android:exported="false"
+            android:screenOrientation="portrait"/>
+
+        <activity android:name=".biometrics.face.FaceEnrollFinish"
+            android:exported="false"
+            android:screenOrientation="portrait"/>
 
         <activity android:name=".biometrics.fingerprint.FingerprintSettings" android:exported="false"/>
         <activity android:name=".biometrics.fingerprint.FingerprintEnrollFindSensor" android:exported="false"/>