am dca46b50: Merge "Keep task stack when invoking settings from setup wizard"

* commit 'dca46b50151e435b061691dee3d7d95ea067d45d':
  Keep task stack when invoking settings from setup wizard
main
Tadashi G. Takaoka 2013-04-25 23:47:43 -07:00 committed by Android Git Automerger
commit 01f044b07a
1 changed files with 1 additions and 2 deletions

View File

@ -236,8 +236,7 @@ public final class SetupActivity extends Activity implements View.OnClickListene
final Intent intent = new Intent(); final Intent intent = new Intent();
intent.setClass(this, SettingsActivity.class); intent.setClass(this, SettingsActivity.class);
intent.setFlags(Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED intent.setFlags(Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED
| Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_CLEAR_TOP);
| Intent.FLAG_ACTIVITY_NO_HISTORY);
startActivity(intent); startActivity(intent);
} }