From 82e476b1885294645bf4f89441e1deea2baf113b Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Fri, 26 Apr 2013 13:03:37 +0900
Subject: [PATCH] Keep task stack when invoking settings from setup wizard

Bug: 8336068
Change-Id: If1df32595f72285b2dad16e28b4429b7b6059839
---
 .../src/com/android/inputmethod/latin/setup/SetupActivity.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/java/src/com/android/inputmethod/latin/setup/SetupActivity.java b/java/src/com/android/inputmethod/latin/setup/SetupActivity.java
index 578787dac..29ee63d4e 100644
--- a/java/src/com/android/inputmethod/latin/setup/SetupActivity.java
+++ b/java/src/com/android/inputmethod/latin/setup/SetupActivity.java
@@ -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);
     }