commit 02d548790bb40f7bdfd087b0c8b9a5e1374425a3
author Andres Morales <anmorales@google.com> Tue Apr 14 11:33:45 2015 -0700
committer Andres Morales <anmorales@google.com> Tue Apr 14 11:33:45 2015 -0700
tree c15e2c33877b61ebdbb1b11c923ed4451eac148b
parent 347c13bcb853abb01c6b416bbca54536f8f56675

Fix crash in settings

Bug: 20207600
Change-Id: I6fe3530c57d0c028ae3b0a0d526b348126c75932

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 83ea62a..6b96ef9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1356,12 +1356,14 @@
 
         <!-- Note this must not be exported since it returns the password in the intent -->
         <activity android:name="ConfirmLockPattern$InternalActivity"
-            android:exported="false"/>
+            android:exported="false"
+            android:theme="@style/Theme.ConfirmDeviceCredentials"/>
 
         <!-- Note this must not be exported since it returns the password in the intent -->
         <activity android:name="ConfirmLockPassword$InternalActivity"
             android:exported="false"
-            android:windowSoftInputMode="stateVisible|adjustResize"/>
+            android:windowSoftInputMode="stateVisible|adjustResize"
+            android:theme="@style/Theme.ConfirmDeviceCredentials"/>
 
         <activity android:name="SetupChooseLockGeneric"
             android:taskAffinity="com.android.wizard"