commit 8ac46040304b7cf8c41bb0ccc60874d485955e13
author Jian Jin <jinjian@google.com> Thu Apr 26 17:27:47 2018 -0700
committer Jian Jin <jinjian@google.com> Mon Apr 30 21:59:59 2018 -0700
tree c658633f5deba636ea9dca2a0c2cfca505ebdad6
parent 8bff4bd2142ca464809f65815bc77f704467ca4e

DO NOT MERGE - Check for existing lock pattern before changing credential in Settings

Fixes: 73383967
Test: RunCarSettingsRoboTests

- Encapsulate screen lock logic inside an Activity
- If a lock pattern is set, show the ConfirmLockPatternFragment, otherwise show ChooseLockTypeFragment
- When the existing lock is verified, launch the list fragment and pass the current lock
- Use the existing lock to update lock settings

Change-Id: Ie31f747f30c2fc1aa97a79e75c90af236f3e3a50

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index aefd55d..546c979 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -97,6 +97,10 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".security.SettingsScreenLockActivity"
+                  android:configChanges="orientation|keyboardHidden|screenSize">
+        </activity>
+
         <activity android:name=".security.SetupWizardScreenLockActivity"
                   android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter>