diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2013-09-05 21:38:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-05 21:38:11 +0000 |
| commit | 10cbbc5515a30dfa347f0a7b816ebde8cbb0e0f7 (patch) | |
| tree | 3afb4fc61fd17348e5ef6da572b4d514e2ad3fab /res/menu | |
| parent | 80c2b9b0c4c03c5ae9459875c05bc7370b7d6ca0 (diff) | |
| parent | 74648ac808b6a625f6c91035a263822b3765215d (diff) | |
| download | packages_apps_Settings-10cbbc5515a30dfa347f0a7b816ebde8cbb0e0f7.tar.gz packages_apps_Settings-10cbbc5515a30dfa347f0a7b816ebde8cbb0e0f7.tar.bz2 packages_apps_Settings-10cbbc5515a30dfa347f0a7b816ebde8cbb0e0f7.zip | |
Merge "Print settings polish" into klp-dev
Diffstat (limited to 'res/menu')
| -rw-r--r-- | res/menu/print_service_settings.xml | 13 | ||||
| -rw-r--r-- | res/menu/print_settings.xml | 4 |
2 files changed, 10 insertions, 7 deletions
diff --git a/res/menu/print_service_settings.xml b/res/menu/print_service_settings.xml index 1ed57ea5f..cb9071c4f 100644 --- a/res/menu/print_service_settings.xml +++ b/res/menu/print_service_settings.xml @@ -16,6 +16,14 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android"> <item + android:id="@+id/print_menu_item_search" + android:title="@string/print_menu_item_search" + android:icon="@*android:drawable/ic_menu_search_holo_dark" + android:actionViewClass="android.widget.SearchView" + android:showAsAction="ifRoom" + android:imeOptions="actionSearch"> + </item> + <item android:id="@+id/print_menu_item_add_printer" android:title="@string/print_menu_item_add_printer" android:showAsAction="ifRoom"> @@ -25,9 +33,4 @@ android:title="@string/print_menu_item_settings" android:showAsAction="ifRoom"> </item> - <item - android:id="@+id/print_menu_item_uninstall" - android:title="@string/print_menu_item_uninstall" - android:showAsAction="never"> - </item> </menu> diff --git a/res/menu/print_settings.xml b/res/menu/print_settings.xml index 44ddf5046..9df1181ef 100644 --- a/res/menu/print_settings.xml +++ b/res/menu/print_settings.xml @@ -16,8 +16,8 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android"> <item - android:id="@+id/print_menu_item_download_print_service" - android:title="@string/print_menu_item_download_print_service" + android:id="@+id/print_menu_item_add_service" + android:title="@string/print_menu_item_add_service" android:showAsAction="ifRoom"> </item> </menu> |