diff options
| author |   satok <satok@google.com> | 2011-07-04 02:11:38 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2011-07-04 02:11:38 -0700 |
| commit | 67b5180e85be1bc8cec0c470ba55966a04371f6e (patch) | |
| tree | 2cf166015fbe70fa5be5194ba868fc675aa0e0fd /java | |
| parent | 29387a8922536c0e33b365d987f89aff40735af1 (diff) | |
| parent | 1be5028dcf12c06bea98de6dcb01801ede215dd2 (diff) | |
| download | latinime-67b5180e85be1bc8cec0c470ba55966a04371f6e.tar.gz latinime-67b5180e85be1bc8cec0c470ba55966a04371f6e.tar.xz latinime-67b5180e85be1bc8cec0c470ba55966a04371f6e.zip | |
Merge "Add SettingsActivity"
Diffstat (limited to 'java')
| -rw-r--r-- | java/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | java/res/xml/method.xml | 2 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/SettingsActivity.java | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml index cb0a9a2e1..57466396b 100644 --- a/java/AndroidManifest.xml +++ b/java/AndroidManifest.xml @@ -21,7 +21,7 @@ <meta-data android:name="android.view.im" android:resource="@xml/method" /> </service> - <activity android:name="Settings" android:label="@string/english_ime_settings"> + <activity android:name="SettingsActivity" android:label="@string/english_ime_settings"> <intent-filter> <action android:name="android.intent.action.MAIN"/> </intent-filter> diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml index 7aaf57b47..43e72ce5f 100644 --- a/java/res/xml/method.xml +++ b/java/res/xml/method.xml @@ -28,7 +28,7 @@ <!-- If IME doesn't have an applicable subtype, the first subtype will be used as a default subtype.--> <input-method xmlns:android="http://schemas.android.com/apk/res/android" - android:settingsActivity="com.android.inputmethod.latin.Settings" + android:settingsActivity="com.android.inputmethod.latin.SettingsActivity" android:isDefault="@bool/im_is_default"> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_mode_en_US_keyboard" diff --git a/java/src/com/android/inputmethod/latin/SettingsActivity.java b/java/src/com/android/inputmethod/latin/SettingsActivity.java new file mode 100644 index 000000000..434d5d5ea --- /dev/null +++ b/java/src/com/android/inputmethod/latin/SettingsActivity.java @@ -0,0 +1,6 @@ +package com.android.inputmethod.latin; + +import android.os.Bundle; + +public class SettingsActivity extends Settings { +}
\ No newline at end of file |