Merge "Remove portrait flag from handoff activity." into sc-v2-dev am: 9220a46cc2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16367697
Change-Id: I46e24c353f27abf435e3f9c81aef9f35d5221277
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 88b7294..fdde854 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2099,8 +2099,7 @@
android:screenOrientation="portrait"/>
<activity android:name=".biometrics.BiometricHandoffActivity"
- android:exported="false"
- android:screenOrientation="portrait"/>
+ android:exported="false"/>
<!-- Must not be exported -->
<activity android:name=".biometrics.BiometricEnrollActivity$InternalActivity"
diff --git a/res/layout/biometric_handoff.xml b/res/layout/biometric_handoff.xml
index 4861568..7da4917 100644
--- a/res/layout/biometric_handoff.xml
+++ b/res/layout/biometric_handoff.xml
@@ -17,8 +17,8 @@
<com.google.android.setupdesign.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- style="?attr/face_layout_theme"
android:id="@+id/setup_wizard_layout"
android:layout_width="match_parent"
- android:layout_height="match_parent">
-</com.google.android.setupdesign.GlifLayout>
\ No newline at end of file
+ android:layout_height="match_parent"
+ android:icon="@drawable/ic_lock">
+</com.google.android.setupdesign.GlifLayout>