aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/LatinIME.java
diff options
context:
space:
mode:
authorsatok <satok@google.com>2010-09-26 22:26:26 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-26 22:26:26 -0700
commitb9c0ed59d0b1565eafbe34d7e38bee7564dbe3fd (patch)
tree993855c6cf3e057ececdf212ff74e9bc5e58501f /java/src/com/android/inputmethod/latin/LatinIME.java
parentb3671b58280b13337533bba385296810e81ff7be (diff)
parent3a2b90357ce056765d5c9d6dec0335c308e21717 (diff)
downloadlatinime-b9c0ed59d0b1565eafbe34d7e38bee7564dbe3fd.tar.gz
latinime-b9c0ed59d0b1565eafbe34d7e38bee7564dbe3fd.tar.xz
latinime-b9c0ed59d0b1565eafbe34d7e38bee7564dbe3fd.zip
am 3a2b9035: Merge "Add Debug Settings Activity" into gingerbread
Merge commit '3a2b90357ce056765d5c9d6dec0335c308e21717' into gingerbread-plus-aosp * commit '3a2b90357ce056765d5c9d6dec0335c308e21717': Add Debug Settings Activity
Diffstat (limited to 'java/src/com/android/inputmethod/latin/LatinIME.java')
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 696f530d3..4729585f6 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -40,6 +40,7 @@ import android.os.Debug;
import android.os.Handler;
import android.os.Message;
import android.os.SystemClock;
+import android.preference.PreferenceActivity;
import android.preference.PreferenceManager;
import android.speech.SpeechRecognizer;
import android.text.ClipboardManager;
@@ -2399,7 +2400,11 @@ public class LatinIME extends InputMethodService
launchSettings(LatinIMESettings.class);
}
- protected void launchSettings(Class<LatinIMESettings> settingsClass) {
+ public void launchDebugSettings() {
+ launchSettings(LatinIMEDebugSettings.class);
+ }
+
+ protected void launchSettings (Class<? extends PreferenceActivity> settingsClass) {
handleClose();
Intent intent = new Intent();
intent.setClass(LatinIME.this, settingsClass);