Reworks lock screen flows.

This also adds frp warning dialogs in case the user skips lock
screen setup initially.

bug:26880444
Change-Id: I732b6a806e139fb6c1c1b334b8d1608c229f217c

src/com/android/settings/ChooseLockGeneric.java

@@ -104,7 +104,6 @@ public class ChooseLockGeneric extends SettingsActivity {
         private int mEncryptionRequestQuality;
         private boolean mEncryptionRequestDisabled;
         private boolean mRequirePassword;
-        private boolean mForFingerprint = false;
         private boolean mForChangeCredRequiredForBoot = false;
         private String mUserPassword;
         private LockPatternUtils mLockPatternUtils;
@@ -130,6 +129,8 @@ public class ChooseLockGeneric extends SettingsActivity {
             }
         };
 
+        protected boolean mForFingerprint = false;
+
         @Override
         protected int getMetricsCategory() {
             return MetricsEvent.CHOOSE_LOCK_GENERIC;
@@ -204,6 +205,10 @@ public class ChooseLockGeneric extends SettingsActivity {
                     mWaitingForConfirmation = true;
                 }
             }
+            addHeaderView();
+        }
+
+        protected void addHeaderView() {
             if (mForFingerprint) {
                 setHeaderView(R.layout.choose_lock_generic_fingerprint_header);
             }
@@ -323,7 +328,7 @@ public class ChooseLockGeneric extends SettingsActivity {
                 if (prefScreen != null) {
                     prefScreen.removeAll();
                 }
-                addPreferencesFromResource(R.xml.security_settings_picker);
+                addPreferences();
                 disableUnusablePreferences(quality, hideDisabledPrefs);
                 updatePreferenceText();
                 updateCurrentPreference();
@@ -333,6 +338,10 @@ public class ChooseLockGeneric extends SettingsActivity {
             }
         }
 
+        protected void addPreferences() {
+            addPreferencesFromResource(R.xml.security_settings_picker);
+        }
+
         private void updatePreferenceText() {
             if (mForFingerprint) {
                 Preference pattern = findPreference(KEY_UNLOCK_SET_PATTERN);