Use GLIF theme for screen lock confirmation
Theme the confirm password screen similar to setup wizard and screen
lock enrollment flow, so that we can start showing it during setup
wizard.
The new layouts are called "internal" because it's supposed to be
used only when another settings screen starts it. For external
intents from CONFIRM_DEVICE_CREDENTIAL, the existing theme and layout
are unchanged.
Bug: 32373672
Test: Run ConfirmLockPasswordTest with `am instrument`
Change-Id: Ib887a763a073e6e4b96264d08846827b2e5cbf52
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 26a5e10..07d7ecc 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1572,11 +1572,11 @@
</activity>
<activity android:name="ConfirmLockPattern"
- android:theme="@style/Theme.ConfirmDeviceCredentials"/>
+ android:theme="@style/SetupWizardTheme.Light"/>
<activity android:name="ConfirmLockPassword"
android:windowSoftInputMode="stateHidden|adjustResize"
- android:theme="@style/Theme.ConfirmDeviceCredentials"/>
+ android:theme="@style/SetupWizardTheme.Light"/>
<activity
android:name=".Settings$FingerprintSuggestionActivity"
@@ -1618,13 +1618,13 @@
<!-- Note this must not be exported since it returns the password in the intent -->
<activity android:name="ConfirmLockPattern$InternalActivity"
android:exported="false"
- android:theme="@style/Theme.ConfirmDeviceCredentials"/>
+ android:theme="@style/SetupWizardTheme.Light"/>
<!-- Note this must not be exported since it returns the password in the intent -->
<activity android:name="ConfirmLockPassword$InternalActivity"
android:exported="false"
android:windowSoftInputMode="adjustResize"
- android:theme="@style/Theme.ConfirmDeviceCredentials"/>
+ android:theme="@style/SetupWizardTheme.Light"/>
<activity android:name="SetupChooseLockGeneric"
android:taskAffinity="com.android.wizard"