am 8d9336d0: Merge "Use splitActionBarWhenNarrow for Android Settings activity" into jb-dev

* commit '8d9336d00f79fd4088ed753b2a60bd42a4b1c270':
  Use splitActionBarWhenNarrow for Android Settings activity
This commit is contained in:
Tadashi G. Takaoka 2012-05-22 00:28:00 -07:00 committed by Android Git Automerger
commit 6e29b2a9c8

View file

@ -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>