diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-05-22 00:28:00 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-05-22 00:28:00 -0700 |
| commit | 6e29b2a9c84cfef3761f04c497d36cf4e2564b83 (patch) | |
| tree | 0b263a50ce311226c7439356e64a25ae1087bf3f /java | |
| parent | 92787ad04d1824e79603295a43fc87e1d3e034a7 (diff) | |
| parent | 8d9336d00f79fd4088ed753b2a60bd42a4b1c270 (diff) | |
| download | latinime-6e29b2a9c84cfef3761f04c497d36cf4e2564b83.tar.gz latinime-6e29b2a9c84cfef3761f04c497d36cf4e2564b83.tar.xz latinime-6e29b2a9c84cfef3761f04c497d36cf4e2564b83.zip | |
am 8d9336d0: Merge "Use splitActionBarWhenNarrow for Android Settings activity" into jb-dev
* commit '8d9336d00f79fd4088ed753b2a60bd42a4b1c270':
Use splitActionBarWhenNarrow for Android Settings activity
Diffstat (limited to 'java')
| -rw-r--r-- | java/AndroidManifest.xml | 3 |
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> |