PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Start redaction activity after we finish current activity."

Browse Source
This commit is contained in:
Udam Saini
2016-02-03 17:54:16 +00:00
committed by Android (Google) Code Review
parent aac74a51da 686ae494f4
commit 662c90aa48
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/ChooseLockPassword.java
View File

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

2
src/com/android/settings/ChooseLockPattern.java
View File

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