aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2012-05-22 00:25:55 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-05-22 00:25:55 -0700
commit8d9336d00f79fd4088ed753b2a60bd42a4b1c270 (patch)
tree9c66f10428c0f2b4d0ada70fdba1309f83de3f3a /java
parente1e3ab6faec39fb1f503faa2d50c92243b8b41b1 (diff)
parent55e5bdc560948d6b3358b0a73208b60f765b8c4f (diff)
downloadlatinime-8d9336d00f79fd4088ed753b2a60bd42a4b1c270.tar.gz
latinime-8d9336d00f79fd4088ed753b2a60bd42a4b1c270.tar.xz
latinime-8d9336d00f79fd4088ed753b2a60bd42a4b1c270.zip
Merge "Use splitActionBarWhenNarrow for Android Settings activity" into jb-dev
Diffstat (limited to 'java')
-rw-r--r--java/AndroidManifest.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml
index 393bc18b8..06d852bb0 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>