diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-08-10 01:32:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-08-10 01:32:02 +0000 |
| commit | 3468371e94006b16cc22303b03fcd98811ed661f (patch) | |
| tree | 2a5f7ab80222295c2080057c97dcd8c0cb72eff7 /AndroidManifest.xml | |
| parent | 3ff5a32ce7155bf504bb8e1cf66800fa577f78d1 (diff) | |
| parent | 22b4edd79ee19b84c09c74ec5d32ddfc3d12cc87 (diff) | |
| download | packages_apps_Settings-3468371e94006b16cc22303b03fcd98811ed661f.tar.gz packages_apps_Settings-3468371e94006b16cc22303b03fcd98811ed661f.tar.bz2 packages_apps_Settings-3468371e94006b16cc22303b03fcd98811ed661f.zip | |
Merge "6/n: Add camera preview to FaceEnrollEnrolling"
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 65fe158da7..2ccd4fe57c 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" @@ -1571,9 +1572,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"/> |