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

Allows the user to go back to Encryption Screen

Browse Source 
bug:22907221
Change-Id: I766407f4f130ac618da178e1b6c04029025db8f2
This commit is contained in:
Udam Saini
2015-12-08 17:28:19 -08:00
parent caac42dc99
commit edac136e16
4 changed files with 91 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/SetupEncryptionInterstitial.java
View File

@@ -38,9 +38,9 @@ import com.android.setupwizardlib.view.NavigationBar;
public class SetupEncryptionInterstitial extends EncryptionInterstitial {
public static Intent createStartIntent(Context ctx, int quality,
boolean requirePasswordDefault) {
boolean requirePasswordDefault, Intent unlockMethodIntent) {
Intent startIntent = EncryptionInterstitial.createStartIntent(ctx, quality,
requirePasswordDefault);
requirePasswordDefault, unlockMethodIntent);
startIntent.setClass(ctx, SetupEncryptionInterstitial.class);
startIntent.putExtra(EXTRA_PREFS_SHOW_BUTTON_BAR, false)
.putExtra(EXTRA_SHOW_FRAGMENT_TITLE_RESID, -1);
@@ -102,12 +102,7 @@ public class SetupEncryptionInterstitial extends EncryptionInterstitial {
@Override
public void onNavigateNext() {
final SetupEncryptionInterstitial activity =
(SetupEncryptionInterstitial) getActivity();
if (activity != null) {
activity.setResult(RESULT_OK, activity.getResultIntentData());
finish();
}
startLockIntent();
}
}
}