diff options
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; + } } |