commit 262d5bd9f964d7fb18d96ec2ccf821b042aa3a3a
author Tadashi G. Takaoka <takaoka@google.com> Wed Apr 10 16:21:20 2013 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Wed Apr 10 16:24:17 2013 +0900
tree b4446847c824b9774506794492900e90cbb9c54f
parent 10af4b6e45689cba9bdc8c22f1bb76bf8bd2516b

Don't override EXTRA_SHOW_FRAGMENT if exists

Bug: 8541190
Change-Id: I37d3de12558efd55f157389d2e0b51fc83dc5da1

java/src/com/android/inputmethod/latin/SettingsActivity.java

diff --git a/java/src/com/android/inputmethod/latin/SettingsActivity.java b/java/src/com/android/inputmethod/latin/SettingsActivity.java
index 99b572e..37ac2e3 100644
--- a/java/src/com/android/inputmethod/latin/SettingsActivity.java
+++ b/java/src/com/android/inputmethod/latin/SettingsActivity.java
@@ -25,7 +25,10 @@
     @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;
     }