Merge "Settings ChooseLockscreen* dismiss in background." into main

src/com/android/settings/password/ChooseLockGeneric.java

@@ -200,6 +200,14 @@ public class ChooseLockGeneric extends SettingsActivity {
             return SettingsEnums.CHOOSE_LOCK_GENERIC;
         }
 
+        @Override
+        public void onPause() {
+            super.onPause();
+            if (!getActivity().isChangingConfigurations() && !mWaitingForConfirmation) {
+                finish();
+            }
+        }
+
         @Override
         public void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);

src/com/android/settings/password/ChooseLockPassword.java

@@ -219,6 +219,13 @@ public class ChooseLockPassword extends SettingsActivity {
         findViewById(R.id.content_parent).setFitsSystemWindows(false);
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
     }
+    @Override
+    public void onPause() {
+        super.onPause();
+        if (!isChangingConfigurations()) {
+            finish();
+        }
+    }
 
     public static class ChooseLockPasswordFragment extends InstrumentedFragment
             implements OnEditorActionListener, TextWatcher, SaveAndFinishWorker.Listener {

src/com/android/settings/password/ChooseLockPattern.java

@@ -98,6 +98,14 @@ public class ChooseLockPattern extends SettingsActivity {
         return modIntent;
     }
 
+    @Override
+    public void onPause() {
+        super.onPause();
+        if (!isChangingConfigurations()) {
+            finish();
+        }
+    }
+
     public static class IntentBuilder {
         private final Intent mIntent;