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

* commit '6e29b2a9c84cfef3761f04c497d36cf4e2564b83':
  Use splitActionBarWhenNarrow for Android Settings activity
This commit is contained in:
Tadashi G. Takaoka 2012-05-22 00:30:31 -07:00 committed by Android Git Automerger
commit 229c72fa87

View file

@ -30,7 +30,8 @@
<meta-data android:name="android.view.textservice.scs" android:resource="@xml/spellchecker" /> <meta-data android:name="android.view.textservice.scs" android:resource="@xml/spellchecker" />
</service> </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> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN"/>
</intent-filter> </intent-filter>