commit c27fe6253c1d8b3ad3c2f891a48ec5c54d77a3f1
author Tadashi G. Takaoka <takaoka@google.com> Fri Apr 13 16:41:24 2012 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Thu Apr 19 19:33:51 2012 +0900
tree 59cb7776ae6eb07336d54e801bf516ed2d05c7b6
parent 344af156744c6866090fb70f151efd66668c1e20

Add custom subtype settings

Bug: 4460018
Change-Id: I4919d79516dcf574be2761bbaf9adcdc381b2ddc

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 5567013..68f8582 100644
--- a/java/src/com/android/inputmethod/latin/SettingsActivity.java
+++ b/java/src/com/android/inputmethod/latin/SettingsActivity.java
@@ -20,11 +20,15 @@
 import android.preference.PreferenceActivity;
 
 public class SettingsActivity extends PreferenceActivity {
+    private static final String DEFAULT_FRAGMENT = Settings.class.getName();
+
     @Override
     public Intent getIntent() {
-        final Intent modIntent = new Intent(super.getIntent());
-        modIntent.putExtra(EXTRA_SHOW_FRAGMENT, Settings.class.getName());
-        modIntent.putExtra(EXTRA_NO_HEADERS, true);
-        return modIntent;
+        final Intent intent = super.getIntent();
+        if (!intent.hasExtra(EXTRA_SHOW_FRAGMENT)) {
+            intent.putExtra(EXTRA_SHOW_FRAGMENT, DEFAULT_FRAGMENT);
+        }
+        intent.putExtra(EXTRA_NO_HEADERS, true);
+        return intent;
     }
 }