diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-05-15 11:04:56 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-05-15 11:04:56 -0700 |
| commit | 33eaf0731595db5a49e93b5e8fecd25918d4fad6 (patch) | |
| tree | f410c75831d8341f9896ba635080ca755303c21d /java/src | |
| parent | 037be7fa0a50b7c4bfc1368b9e9e158473f2e3b5 (diff) | |
| parent | 01f044b07a7c90d2b87f5cc31b363326134dfc7c (diff) | |
| download | latinime-33eaf0731595db5a49e93b5e8fecd25918d4fad6.tar.gz latinime-33eaf0731595db5a49e93b5e8fecd25918d4fad6.tar.xz latinime-33eaf0731595db5a49e93b5e8fecd25918d4fad6.zip | |
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
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/setup/SetupActivity.java | 3 |
1 files changed, 1 insertions, 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); } |