commit dca46b50151e435b061691dee3d7d95ea067d45d
author Tadashi G. Takaoka <takaoka@google.com> Fri Apr 26 06:45:52 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 26 06:45:52 2013 +0000
tree c7b6c7e633b2c3c4f042c12fab352f48e90a0c50
parent 9fc82bdb169f20fd0e42297dbb54e66ac87486bd
parent 82e476b1885294645bf4f89441e1deea2baf113b

Merge "Keep task stack when invoking settings from setup wizard"

java/src/com/android/inputmethod/latin/setup/SetupActivity.java

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