aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/SettingsActivity.java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2013-04-10 16:21:20 +0900
committerTadashi G. Takaoka <takaoka@google.com>2013-04-10 16:24:17 +0900
commit262d5bd9f964d7fb18d96ec2ccf821b042aa3a3a (patch)
treeb4446847c824b9774506794492900e90cbb9c54f /java/src/com/android/inputmethod/latin/SettingsActivity.java
parent10af4b6e45689cba9bdc8c22f1bb76bf8bd2516b (diff)
downloadlatinime-262d5bd9f964d7fb18d96ec2ccf821b042aa3a3a.tar.gz
latinime-262d5bd9f964d7fb18d96ec2ccf821b042aa3a3a.tar.xz
latinime-262d5bd9f964d7fb18d96ec2ccf821b042aa3a3a.zip
Don't override EXTRA_SHOW_FRAGMENT if exists
Bug: 8541190 Change-Id: I37d3de12558efd55f157389d2e0b51fc83dc5da1
Diffstat (limited to 'java/src/com/android/inputmethod/latin/SettingsActivity.java')
-rw-r--r--java/src/com/android/inputmethod/latin/SettingsActivity.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/SettingsActivity.java b/java/src/com/android/inputmethod/latin/SettingsActivity.java
index 99b572e06..37ac2e35c 100644
--- a/java/src/com/android/inputmethod/latin/SettingsActivity.java
+++ b/java/src/com/android/inputmethod/latin/SettingsActivity.java
@@ -25,7 +25,10 @@ public final class SettingsActivity extends PreferenceActivity {
@Override
public Intent getIntent() {
final Intent intent = super.getIntent();
- intent.putExtra(EXTRA_SHOW_FRAGMENT, DEFAULT_FRAGMENT);
+ final String fragment = intent.getStringExtra(EXTRA_SHOW_FRAGMENT);
+ if (fragment == null) {
+ intent.putExtra(EXTRA_SHOW_FRAGMENT, DEFAULT_FRAGMENT);
+ }
intent.putExtra(EXTRA_NO_HEADERS, true);
return intent;
}