diff options
author | Jim Miller <jaggies@google.com> | 2014-10-17 23:57:34 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-17 23:57:34 +0000 |
commit | 3221a342117bc3fd366e3f6520db0cb0672bb1f1 (patch) | |
tree | d180b73b771b01f480bcf5ccead096c85c57a2eb /src/com/android/settings/SettingsActivity.java | |
parent | 1f39d6a6e78d5fd0595306d1ed38a8f7ac04e3fe (diff) | |
parent | ba1b33407d66289a2367caab3141a3555f1fdcf7 (diff) | |
download | packages_apps_Settings-3221a342117bc3fd366e3f6520db0cb0672bb1f1.tar.gz packages_apps_Settings-3221a342117bc3fd366e3f6520db0cb0672bb1f1.tar.bz2 packages_apps_Settings-3221a342117bc3fd366e3f6520db0cb0672bb1f1.zip |
am ba1b3340: am 602d559d: Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev
* commit 'ba1b33407d66289a2367caab3141a3555f1fdcf7':
Several fixes to new EncryptionInterstitial dialog.
Diffstat (limited to 'src/com/android/settings/SettingsActivity.java')
-rw-r--r-- | src/com/android/settings/SettingsActivity.java | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index 3ca85eabe..37fcc8719 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -368,6 +368,8 @@ public class SettingsActivity extends Activity private boolean mNeedToRevertToInitialFragment = false; private int mHomeActivitiesCount = 1; + private Intent mResultIntentData; + public SwitchBar getSwitchBar() { return mSwitchBar; } @@ -597,21 +599,21 @@ public class SettingsActivity extends Activity Button backButton = (Button)findViewById(R.id.back_button); backButton.setOnClickListener(new OnClickListener() { public void onClick(View v) { - setResult(RESULT_CANCELED); + setResult(RESULT_CANCELED, getResultIntentData()); finish(); } }); Button skipButton = (Button)findViewById(R.id.skip_button); skipButton.setOnClickListener(new OnClickListener() { public void onClick(View v) { - setResult(RESULT_OK); + setResult(RESULT_OK, getResultIntentData()); finish(); } }); mNextButton = (Button)findViewById(R.id.next_button); mNextButton.setOnClickListener(new OnClickListener() { public void onClick(View v) { - setResult(RESULT_OK); + setResult(RESULT_OK, getResultIntentData()); finish(); } }); @@ -1345,4 +1347,12 @@ public class SettingsActivity extends Activity mSearchMenuItem.collapseActionView(); } } + + public Intent getResultIntentData() { + return mResultIntentData; + } + + public void setResultIntentData(Intent resultIntentData) { + mResultIntentData = resultIntentData; + } } |