9 files changed, 73 insertions, 11 deletions
diff --git a/res/drawable-hdpi/ic_print.png b/res/drawable-hdpi/ic_print.png
new file mode 100644
index 0000000..aaff3dd
--- /dev/null
+++ b/res/drawable-hdpi/ic_print.png
diff --git a/res/drawable-mdpi/ic_print.png b/res/drawable-mdpi/ic_print.png
new file mode 100644
index 0000000..a3954b5
--- /dev/null
+++ b/res/drawable-mdpi/ic_print.png
diff --git a/res/drawable-xhdpi/ic_print.png b/res/drawable-xhdpi/ic_print.png
new file mode 100644
index 0000000..6b55a14
--- /dev/null
+++ b/res/drawable-xhdpi/ic_print.png
diff --git a/res/menu/print_service_settings.xml b/res/menu/print_service_settings.xml
new file mode 100644
index 0000000..1ed57ea
--- /dev/null
+++ b/res/menu/print_service_settings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/print_menu_item_add_printer"
+        android:title="@string/print_menu_item_add_printer"
+        android:showAsAction="ifRoom">
+    </item>
+    <item
+        android:id="@+id/print_menu_item_settings"
+        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
new file mode 100644
index 0000000..44ddf50
--- /dev/null
+++ b/res/menu/print_settings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<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:showAsAction="ifRoom">
+    </item>
+</menu>
diff --git a/res/values/donottranslate.xml b/res/values/donottranslate.xml
index ba4ff2e..12697ce 100644
--- a/res/values/donottranslate.xml
+++ b/res/values/donottranslate.xml
@@ -33,5 +33,7 @@
         <item>@string/input_method_selector_always_show_value</item>
         <item>@string/input_method_selector_always_hide_value</item>
     </string-array>
+    <!-- Default query string to search for a print service. -->
+    <string name="download_print_service_query">market://search?q=print service</string>
 
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index faa274c..4ad76ce 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3393,9 +3393,7 @@
     <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
     <string name="print_settings">Printing</string>
     <!-- Title for print service settings screen [CHAR LIMIT=25] -->
-    <string name="print_settings_title">Printing settings</string>
-    <!-- Title for the printing preference category of print services. [CHAR LIMIT=25] -->
-    <string name="print_services_title">Services</string>
+    <string name="print_settings_title">Print services</string>
 
     <!-- Title for a warning message about security implications of enabling a print service,
          displayed as a dialog message when the user selects to enable a print service (tablet). [CHAR LIMIT=NONE] -->
@@ -3421,6 +3419,18 @@
     <!-- Summary for the disabled state of a print feature. [CHAR LIMIT=10] -->
     <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>
+
+    <!-- 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 printer categoty showing a list of available printers. [CHAR LIMIT=25] -->
+    <string name="category_printers">Printers</string>
+
     <!-- App Fuel Gauge strings -->
     <skip />
 
diff --git a/res/xml/print_settings.xml b/res/xml/print_settings.xml
index b21f2ac..dc31968 100644
--- a/res/xml/print_settings.xml
+++ b/res/xml/print_settings.xml
@@ -17,10 +17,4 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
         android:title="@string/print_settings_title">
-
-    <PreferenceCategory
-            android:key="services_category"
-            android:title="@string/print_services_title">
-    </PreferenceCategory>
-
 </PreferenceScreen>
diff --git a/res/xml/settings_headers.xml b/res/xml/settings_headers.xml
index 1d27a35..6aa6691 100644
--- a/res/xml/settings_headers.xml
+++ b/res/xml/settings_headers.xml
@@ -184,8 +184,8 @@
     <!-- Print -->
     <header
         android:id="@+id/print_settings"
-        android:fragment="com.android.settings.PrintingSettings"
-        android:icon="@drawable/ic_settings_accessibility"
+        android:fragment="com.android.settings.print.PrintSettingsFragment"
+        android:icon="@drawable/ic_print"
         android:title="@string/print_settings" />
 
     <!-- Development -->