diff options
| author | Scott Main <smain@google.com> | 2011-01-27 15:07:01 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-27 15:07:01 -0800 |
| commit | f43f31761af52264836ce9dc5de29b27036b13dd (patch) | |
| tree | 2d55bc8222b2cb54b093165a7317fce0f65280e7 /samples/NotePad | |
| parent | 3809ac29168802be1f319fdbca5b7f9cd324d4fa (diff) | |
| parent | 44a6ed7b3ff5080dc18f821d83852e331d7a3891 (diff) | |
| download | android_development-f43f31761af52264836ce9dc5de29b27036b13dd.tar.gz android_development-f43f31761af52264836ce9dc5de29b27036b13dd.tar.bz2 android_development-f43f31761af52264836ce9dc5de29b27036b13dd.zip | |
am 44a6ed7b: Merge "change notepad min sdk version to 11 and adjust action item appearance" into honeycomb
* commit '44a6ed7b3ff5080dc18f821d83852e331d7a3891':
change notepad min sdk version to 11 and adjust action item appearance
Diffstat (limited to 'samples/NotePad')
| -rw-r--r-- | samples/NotePad/AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | samples/NotePad/res/menu/editor_options_menu.xml | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/samples/NotePad/AndroidManifest.xml b/samples/NotePad/AndroidManifest.xml index 63428049e..ead782925 100644 --- a/samples/NotePad/AndroidManifest.xml +++ b/samples/NotePad/AndroidManifest.xml @@ -22,7 +22,8 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.android.notepad" > - <uses-sdk android:minSdkVersion="Gingerbread" /> + <uses-sdk android:minSdkVersion="11" /> + <application android:icon="@drawable/app_notes" android:label="@string/app_name" > diff --git a/samples/NotePad/res/menu/editor_options_menu.xml b/samples/NotePad/res/menu/editor_options_menu.xml index ce385a645..306139ae5 100644 --- a/samples/NotePad/res/menu/editor_options_menu.xml +++ b/samples/NotePad/res/menu/editor_options_menu.xml @@ -4,12 +4,12 @@ android:icon="@drawable/ic_menu_save" android:alphabeticShortcut='s' android:title="@string/menu_save" - android:showAsAction="always" /> + android:showAsAction="ifRoom|withText" /> <item android:id="@+id/menu_revert" android:icon="@drawable/ic_menu_revert" android:title="@string/menu_revert" /> <item android:id="@+id/menu_delete" android:icon="@drawable/ic_menu_delete" android:title="@string/menu_delete" - android:showAsAction="always" /> + android:showAsAction="ifRoom|withText" /> </menu>
\ No newline at end of file |