diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-04-25 23:47:43 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-04-25 23:47:43 -0700 |
| commit | 01f044b07a7c90d2b87f5cc31b363326134dfc7c (patch) | |
| tree | c7b6c7e633b2c3c4f042c12fab352f48e90a0c50 /java/src/com/android/inputmethod | |
| parent | 3385fe8ff58cf42f1c1abac85d6d2ba2aa62ff32 (diff) | |
| parent | dca46b50151e435b061691dee3d7d95ea067d45d (diff) | |
| download | latinime-01f044b07a7c90d2b87f5cc31b363326134dfc7c.tar.gz latinime-01f044b07a7c90d2b87f5cc31b363326134dfc7c.tar.xz latinime-01f044b07a7c90d2b87f5cc31b363326134dfc7c.zip | |
am dca46b50: Merge "Keep task stack when invoking settings from setup wizard"
* commit 'dca46b50151e435b061691dee3d7d95ea067d45d':
Keep task stack when invoking settings from setup wizard
Diffstat (limited to 'java/src/com/android/inputmethod')
| -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); } |