diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-10-06 09:13:25 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-10-06 09:13:25 +0000 |
| commit | fc08ae8c205a340c3dd45f1fb87372e2b8176375 (patch) | |
| tree | b7940de5528ec45926b11f62963fb52a73d3025a /java | |
| parent | fd5759915679b8e25cfa61ff1c7bf306f5bf280b (diff) | |
| parent | a697c62b7d1e6d13c6e48f23af07e3b64f55dc3b (diff) | |
| download | latinime-fc08ae8c205a340c3dd45f1fb87372e2b8176375.tar.gz latinime-fc08ae8c205a340c3dd45f1fb87372e2b8176375.tar.xz latinime-fc08ae8c205a340c3dd45f1fb87372e2b8176375.zip | |
am a697c62b: Merge "Stop using splitActionBar"
* commit 'a697c62b7d1e6d13c6e48f23af07e3b64f55dc3b':
Stop using splitActionBar
Diffstat (limited to 'java')
| -rw-r--r-- | java/AndroidManifest.xml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml index 25fa0f9e3..ee1cef6b5 100644 --- 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> |