commit cb53c63eabf006283ec973f41f3f7d7fc4155f0d
author Jean Chalard <jchalard@google.com> Tue May 22 00:29:57 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 22 00:29:57 2012 -0700
tree c314bd68e08a1ab033d59f13c6f79e4c6b6b5c1c
parent 8d9336d00f79fd4088ed753b2a60bd42a4b1c270
parent 80058c73cb1c807f93d373ac50850b9d461abf58

Merge "Update AOSP dictionaries" into jb-dev

java/AndroidManifest.xml

diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml
index 393bc18..06d852b 100644
--- a/java/AndroidManifest.xml
+++ b/java/AndroidManifest.xml
@@ -30,7 +30,8 @@
             <meta-data android:name="android.view.textservice.scs" android:resource="@xml/spellchecker" />
         </service>
 
-        <activity android:name="SettingsActivity" android:label="@string/english_ime_settings">
+        <activity android:name="SettingsActivity" android:label="@string/english_ime_settings"
+                  android:uiOptions="splitActionBarWhenNarrow">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
             </intent-filter>