Merge "Stop using splitActionBar"

2014-10-06 08:19:12 +00:00 · 2014-10-06 08:19:12 +00:00 · a697c62b7d
parent 4bde90bf77 477ee88022
commit a697c62b7d
1 changed files with 1 additions and 2 deletions
--- a/java/AndroidManifest.xml
+++ b/java/AndroidManifest.xml
@ -89,8 +89,7 @@

        <activity android:name=".settings.SettingsActivity"
                android:theme="@style/platformSettingsTheme"
-                android:label="@string/english_ime_settings"
-                android:uiOptions="splitActionBarWhenNarrow">
+                android:label="@string/english_ime_settings">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
            </intent-filter>