aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/SettingsActivity.java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2012-04-13 16:41:24 +0900
committerTadashi G. Takaoka <takaoka@google.com>2012-04-19 19:33:51 +0900
commitc27fe6253c1d8b3ad3c2f891a48ec5c54d77a3f1 (patch)
tree59cb7776ae6eb07336d54e801bf516ed2d05c7b6 /java/src/com/android/inputmethod/latin/SettingsActivity.java
parent344af156744c6866090fb70f151efd66668c1e20 (diff)
downloadlatinime-c27fe6253c1d8b3ad3c2f891a48ec5c54d77a3f1.tar.gz
latinime-c27fe6253c1d8b3ad3c2f891a48ec5c54d77a3f1.tar.xz
latinime-c27fe6253c1d8b3ad3c2f891a48ec5c54d77a3f1.zip
Add custom subtype settings
Bug: 4460018 Change-Id: I4919d79516dcf574be2761bbaf9adcdc381b2ddc
Diffstat (limited to 'java/src/com/android/inputmethod/latin/SettingsActivity.java')
-rw-r--r--java/src/com/android/inputmethod/latin/SettingsActivity.java12
1 files changed, 8 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/latin/SettingsActivity.java b/java/src/com/android/inputmethod/latin/SettingsActivity.java
index 556701364..68f8582fc 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.content.Intent;
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;
}
}