Start redaction activity after we finish current activity.

This is needed so that activity manager won't start a new task stack.
During setup, we want everything on the same task stack to allow
task locking.

Change-Id: Iaa1e13da8251ad37362ea41b374300268b6e9875

src/com/android/settings/ChooseLockPassword.java

@@ -669,7 +669,6 @@ public class ChooseLockPassword extends SettingsActivity {
         @Override
         public void onChosenLockSaveFinished(boolean wasSecureBefore, Intent resultData) {
             getActivity().setResult(RESULT_FINISHED, resultData);
-            getActivity().finish();
 
             if (!wasSecureBefore) {
                 Intent intent = getRedactionInterstitialIntent(getActivity());
@@ -677,6 +676,7 @@ public class ChooseLockPassword extends SettingsActivity {
                     startActivity(intent);
                 }
             }
+            getActivity().finish();
         }
     }
 

src/com/android/settings/ChooseLockPattern.java

@@ -670,7 +670,6 @@ public class ChooseLockPattern extends SettingsActivity {
         @Override
         public void onChosenLockSaveFinished(boolean wasSecureBefore, Intent resultData) {
             getActivity().setResult(RESULT_FINISHED, resultData);
-            getActivity().finish();
 
             if (!wasSecureBefore) {
                 Intent intent = getRedactionInterstitialIntent(getActivity());
@@ -678,6 +677,7 @@ public class ChooseLockPattern extends SettingsActivity {
                     startActivity(intent);
                 }
             }
+            getActivity().finish();
         }
     }