diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2013-09-05 14:41:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-05 14:41:35 -0700 |
| commit | e44430583a40dfc178924256cc4e6776f9d00701 (patch) | |
| tree | ab3e0d242e1426b756537458195788d4c2083fde /res | |
| parent | 3730334d5b9355cad691c422272c88546035deca (diff) | |
| parent | 10cbbc5515a30dfa347f0a7b816ebde8cbb0e0f7 (diff) | |
| download | packages_apps_Settings-e44430583a40dfc178924256cc4e6776f9d00701.zip packages_apps_Settings-e44430583a40dfc178924256cc4e6776f9d00701.tar.gz packages_apps_Settings-e44430583a40dfc178924256cc4e6776f9d00701.tar.bz2 | |
am 10cbbc55: Merge "Print settings polish" into klp-dev
* commit '10cbbc5515a30dfa347f0a7b816ebde8cbb0e0f7':
Print settings polish
Diffstat (limited to 'res')
| -rw-r--r-- | res/menu/print_service_settings.xml | 13 | ||||
| -rw-r--r-- | res/menu/print_settings.xml | 4 | ||||
| -rw-r--r-- | res/values/strings.xml | 6 |
3 files changed, 13 insertions, 10 deletions
diff --git a/res/menu/print_service_settings.xml b/res/menu/print_service_settings.xml index 1ed57ea..cb9071c 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 44ddf50..9df1181 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> diff --git a/res/values/strings.xml b/res/values/strings.xml index dae3f6e..ded01d9 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -3420,13 +3420,13 @@ <string name="print_feature_state_off">Off</string> <!-- Title of the action bar button to got to Play Store to download a print service. [CHAR LIMIT=25] --> - <string name="print_menu_item_download_print_service">I don\'t see mine</string> + <string name="print_menu_item_add_service">Add service</string> <!-- Title of the action bar button to got to add a printer. [CHAR LIMIT=25] --> <string name="print_menu_item_add_printer">Add printer</string> - <!-- Title of the action bar button uninstall a print service. [CHAR LIMIT=25] --> - <string name="print_menu_item_uninstall">Uninstall</string> + <!-- Title for the search action bar menu item. [CHAR LIMIT=20] --> + <string name="print_menu_item_search">Search</string> <!-- Title for the printer categoty showing a list of available printers. [CHAR LIMIT=25] --> <string name="category_printers">Printers</string> |