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

* commit '01f044b07a7c90d2b87f5cc31b363326134dfc7c':
  Keep task stack when invoking settings from setup wizard
This commit is contained in:
Tadashi G. Takaoka 2013-05-15 11:04:56 -07:00 committed by Android Git Automerger
commit 33eaf07315

View file

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