commit 09b5228ae56283ebcb69d1c295033c74ea868ae5
author Jay Civelli <jcivelli@google.com> Thu Jul 10 17:27:07 2014 -0700
committer Jay Civelli <jcivelli@google.com> Tue Jul 29 09:38:38 2014 -0700
tree 45796f602404cb7d4487479a8bdd0d1d1d9b652f
parent 4a45be2ff83e1b3b9bd52be523639d100311bec3

New activity that asks users to confirm their pattern. DO NOT MERGE

Adds an activity that prompts the user for their PIN/password/pattern.

cherry-pick from master b88e8577b9049392aa50649cb40edc845d43d689

Bug 16242766

Change-Id: I3468215a8ac522a06de6573c93a5f5a6dc72ee2d

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 67e34f1..a50343e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1057,6 +1057,16 @@
         <!-- Second and third-level settings -->
 
         <!-- Lock screen settings -->
+        <activity android:name="ConfirmDeviceCredentialActivity"
+            android:exported="true">
+            <!-- Use high-priority to prevent an installed activity from masquerading as this one. -->
+            <intent-filter android:priority="1000">
+                <action android:name="android.intent.action.CONFIRM_DEVICE_CREDENTIAL" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+
         <activity android:name="ConfirmLockPattern"/>
 
         <activity android:name="ConfirmLockPassword"