commit c206d0462354b3bf1ad0cec61534da567829555d
author Tadashi G. Takaoka <takaoka@google.com> Fri Apr 13 19:53:44 2012 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Fri Apr 13 19:56:47 2012 +0900
tree c3f88ffdd598f6aef862a828ccde82ea40c451f5
parent f6972561fcb45310f18230ce217f0c6bb57e7eee

Use InputMethodSettingsFragment for IME settings

Change-Id: Id6d9cd0ddf99c0687b6d3ea4b2f868f6cf2a0eaf

java/AndroidManifest.xml

diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml
index 9f62e97..393bc18 100644
--- a/java/AndroidManifest.xml
+++ b/java/AndroidManifest.xml
@@ -30,7 +30,7 @@
             <meta-data android:name="android.view.textservice.scs" android:resource="@xml/spellchecker" />
         </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>
@@ -43,7 +43,7 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="DebugSettings" android:label="@string/english_ime_debug_settings">
+        <activity android:name="DebugSettingsActivity" android:label="@string/english_ime_debug_settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
             </intent-filter>