Printer discovery: Renaming + dealing with localization.

Change-Id: Ib8e00f43fdf49f5d87a049ab197c279b08ba6c0b

32 files changed, 123 insertions, 110 deletions

diff --git a/PrinterVendorDiscovery/Android.mk b/PrintServiceStubs/Android.mk
index 1378de5..1c4f722 100644
--- a/PrinterVendorDiscovery/Android.mk
+++ b/PrintServiceStubs/Android.mk
@@ -6,6 +6,6 @@ LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_PACKAGE_NAME := PrinterVendorDiscovery
+LOCAL_PACKAGE_NAME := PrintServiceStubs
 
 include $(BUILD_PACKAGE)
diff --git a/PrinterVendorDiscovery/AndroidManifest.xml b/PrintServiceStubs/AndroidManifest.xml
index c39a595..38f515c 100644
--- a/PrinterVendorDiscovery/AndroidManifest.xml
+++ b/PrintServiceStubs/AndroidManifest.xml
@@ -17,7 +17,7 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.printerdiscovery">
+    package="com.android.printservicestubs">
 
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -30,7 +30,7 @@
         android:fullBackupContent="false"
         android:allowBackup="false">
         <activity
-                android:name=".PrinterDiscovery"
+                android:name=".TestApp"
                 android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -39,7 +39,7 @@
         </activity>
 
         <provider
-            android:authorities="com.android.printerdiscovery"
+            android:authorities="com.android.printservicestubs"
             android:name=".PrintServiceStubProvider" />
     </application>
 </manifest>
diff --git a/PrinterVendorDiscovery/res/layout/printer_discovery.xml b/PrintServiceStubs/res/layout/test_app.xml
index ba7f38e..6673810 100644
--- a/PrinterVendorDiscovery/res/layout/printer_discovery.xml
+++ b/PrintServiceStubs/res/layout/test_app.xml
@@ -20,13 +20,12 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".PrinterDiscovery">
+    tools:context=".TestApp">
 
     <ListView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:id="@+id/discovered_printers">
+        android:id="@+id/print_service_stubs">
 
     </ListView>
-
 </LinearLayout>
diff --git a/PrinterVendorDiscovery/res/values/donottranslate.xml b/PrintServiceStubs/res/values/donottranslate.xml
index fd76b7f..fd76b7f 100644
--- a/PrinterVendorDiscovery/res/values/donottranslate.xml
+++ b/PrintServiceStubs/res/values/donottranslate.xml
diff --git a/PrinterVendorDiscovery/res/values/strings.xml b/PrintServiceStubs/res/values/strings.xml
index 9e2e654..a1b559f 100644
--- a/PrinterVendorDiscovery/res/values/strings.xml
+++ b/PrintServiceStubs/res/values/strings.xml
@@ -18,8 +18,17 @@
 -->
 
 <resources>
-    <string name="app_name">Printer Discovery Helper</string>
+    <string name="app_name">Print Service Stubs</string>
 
     <string name="plugin_vendor_mopria">Mopria</string>
     <string name="plugin_vendor_gcp">Google Cloud Print</string>
+    <string name="plugin_vendor_hp">HP</string>
+    <string name="plugin_vendor_lexmark">Lexmark</string>
+    <string name="plugin_vendor_brother">Brother</string>
+    <string name="plugin_vendor_canon">Canon</string>
+    <string name="plugin_vendor_xerox">Xerox</string>
+    <string name="plugin_vendor_samsung">Samsung Electorics</string>
+    <string name="plugin_vendor_epson">Epson</string>
+    <string name="plugin_vendor_konika_minolta">Konika Minolta</string>
+    <string name="plugin_vendor_fuji">Fuji</string>
 </resources>
diff --git a/PrinterVendorDiscovery/res/xml/vendorconfigs.xml b/PrintServiceStubs/res/xml/vendorconfigs.xml
index 19f304f..347bbd8 100644
--- a/PrinterVendorDiscovery/res/xml/vendorconfigs.xml
+++ b/PrintServiceStubs/res/xml/vendorconfigs.xml
@@ -28,7 +28,7 @@
     </vendor>
 
     <vendor>
-        <name>HP</name>
+        <name>@string/plugin_vendor_hp</name>
         <package>com.hp.android.printservice</package>
         <mdns-names>
             <mdns-name>HP</mdns-name>
@@ -38,7 +38,7 @@
     </vendor>
 
     <vendor>
-        <name>Lexmark</name>
+        <name>@string/plugin_vendor_lexmark</name>
         <package>com.lexmark.print.plugin</package>
         <mdns-names>
             <mdns-name>Lexmark</mdns-name>
@@ -47,7 +47,7 @@
     </vendor>
 
     <vendor>
-        <name>Brother</name>
+        <name>@string/plugin_vendor_brother</name>
         <package>com.brother.printservice</package>
         <mdns-names>
             <mdns-name>Brother</mdns-name>
@@ -55,7 +55,7 @@
     </vendor>
 
     <vendor>
-        <name>Canon</name>
+        <name>@string/plugin_vendor_canon</name>
         <package>com.xerox.printservice</package>
         <mdns-names>
             <mdns-name>Canon</mdns-name>
@@ -63,7 +63,7 @@
     </vendor>
 
     <vendor>
-        <name>Xerox</name>
+        <name>@string/plugin_vendor_xerox</name>
         <package>jp.co.canon.android.printservice.plugin</package>
         <mdns-names>
             <mdns-name>Xerox</mdns-name>
@@ -71,7 +71,7 @@
     </vendor>
 
     <vendor>
-        <name>Samsung Electronics</name>
+        <name>@string/plugin_vendor_samsung</name>
         <package>com.sec.app.samsungprintservice</package>
         <mdns-names>
             <mdns-name>Samsung</mdns-name>
@@ -79,7 +79,7 @@
     </vendor>
 
     <vendor>
-        <name>Epson</name>
+        <name>@string/plugin_vendor_epson</name>
         <package>com.epson.mobilephone.android.epsonprintserviceplugin</package>
         <mdns-names>
             <mdns-name>Epson</mdns-name>
@@ -87,16 +87,17 @@
     </vendor>
 
     <vendor>
-        <name>kmkmkm</name>
+        <name>@string/plugin_vendor_konika_minolta</name>
         <package>com.kmbt.printservice</package>
         <mdns-names>
+            <mdns-name>kmkmkm</mdns-name>
             <mdns-name>Konica Minolta</mdns-name>
             <mdns-name>Minolta</mdns-name>
         </mdns-names>
     </vendor>
 
     <vendor>
-        <name>Fuji</name>
+        <name>@string/plugin_vendor_fuji</name>
         <package>jp.co.fujixerox.prt.PrintUtil.PCL</package>
         <mdns-names>
             <mdns-name>FUJI XEROX</mdns-name>
diff --git a/PrinterVendorDiscovery/src/com/android/printerdiscovery/PrintServiceStub.java b/PrintServiceStubs/src/com/android/printservicestubs/PrintServiceStub.java
index b17b6b5..3bf951c 100644
--- a/PrinterVendorDiscovery/src/com/android/printerdiscovery/PrintServiceStub.java
+++ b/PrintServiceStubs/src/com/android/printservicestubs/PrintServiceStub.java
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.printerdiscovery;
+package com.android.printservicestubs;
 
 import android.annotation.IntRange;
 import android.annotation.NonNull;
+import android.annotation.StringRes;
 import android.net.Uri;
 
 /**
@@ -41,13 +42,13 @@ public interface PrintServiceStub {
     }
 
     /**
-     * Get the name of the {@link android.printservice.PrintService print service} that will be
-     * installed via the {@link #getInstallUri}. This is read once, hence returning different data
-     * at different times is not allowed.
+     * Get the name (a string reference) of the {@link android.printservice.PrintService print
+     * service} that will be installed via the {@link #getInstallUri}. This is read once, hence
+     * returning different data at different times is not allowed.
      *
      * @return The name of the print service.
      */
-    @NonNull String getName();
+    @StringRes int getName();
 
     /**
      * Uri to view when the stub is selected by the user. Usually a link that will install the print
diff --git a/PrinterVendorDiscovery/src/com/android/printerdiscovery/PrintServiceStubContract.java b/PrintServiceStubs/src/com/android/printservicestubs/PrintServiceStubContract.java
index 8df190e..2e15526 100644
--- a/PrinterVendorDiscovery/src/com/android/printerdiscovery/PrintServiceStubContract.java
+++ b/PrintServiceStubs/src/com/android/printservicestubs/PrintServiceStubContract.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package com.android.printerdiscovery;
+package com.android.printservicestubs;
 
 import android.net.Uri;
 import android.provider.BaseColumns;
 
 /**
- * Contract for accessing the com.android.printerdiscovery provider.
+ * Contract for accessing the com.android.printservicestubs provider.
  */
 public final class PrintServiceStubContract {
     /**
      * Authority string for this provider.
      */
-    public static final String AUTHORITY = "com.android.printerdiscovery";
+    public static final String AUTHORITY = "com.android.printservicestubs";
 
     /**
      * The content:// style URL for this provider
@@ -40,13 +40,13 @@ public final class PrintServiceStubContract {
         /**
          * The content:// style URL for this table
          */
-        public static final Uri CONTENT_URI =
-                Uri.parse("content://" + AUTHORITY + "/discovery_services");
+        public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/stubs");
 
         public static final String _ID = BaseColumns._ID;
 
         /**
-         * The name of the service the stub is for. <p>TYPE: TEXT</p>
+         * The name of the service the stub is for (as a string resource of the
+         * com.android.printservicestubs package). <p>TYPE: INTEGER</p>
          */
         public static final String NAME = "name";
 
diff --git a/PrinterVendorDiscovery/src/com/android/printerdiscovery/PrintServiceStubProvider.java b/PrintServiceStubs/src/com/android/printservicestubs/PrintServiceStubProvider.java
index 414e14c..12cb804 100644
--- a/PrinterVendorDiscovery/src/com/android/printerdiscovery/PrintServiceStubProvider.java
+++ b/PrintServiceStubs/src/com/android/printservicestubs/PrintServiceStubProvider.java
@@ -1,17 +1,18 @@
-package com.android.printerdiscovery;
+package com.android.printservicestubs;
 
 import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.content.ContentProvider;
 import android.content.ContentResolver;
 import android.content.ContentValues;
+import android.content.res.Configuration;
 import android.database.*;
 import android.net.Uri;
 import android.util.Log;
 import com.android.internal.util.Preconditions;
-import com.android.printerdiscovery.stubs.gcp.GoogleCloudPrintStub;
-import com.android.printerdiscovery.stubs.mdnsFilter.MDNSFilterStub;
-import com.android.printerdiscovery.stubs.mopria.MopriaStub;
+import com.android.printservicestubs.stubs.gcp.GoogleCloudPrintStub;
+import com.android.printservicestubs.stubs.mdnsFilter.MDNSFilterStub;
+import com.android.printservicestubs.stubs.mopria.MopriaStub;
 import org.xmlpull.v1.XmlPullParserException;
 
 import java.io.IOException;
@@ -49,6 +50,7 @@ public class PrintServiceStubProvider extends ContentProvider
         // Add the stubs defined in {@link R.xml#vendorconfigs vendorconfigs.xml}
         for (VendorConfig config : configs) {
             if (!config.getMDNSNames().isEmpty()) {
+                Log.d(LOG_TAG, config.toString());
                 stubs.add(new RemotePrintServiceStub(
                         new MDNSFilterStub(getContext(), config.getName(),
                                 config.getPackageName(), config.getMDNSNames()), this, false));
@@ -86,7 +88,7 @@ public class PrintServiceStubProvider extends ContentProvider
 
             return true;
         } catch (Exception e) {
-            Log.e(LOG_TAG, "Could not initialize stub", e);
+            Log.e(LOG_TAG, "Could not initialize stubs", e);
             return false;
         }
     }
diff --git a/PrinterVendorDiscovery/src/com/android/printerdiscovery/RemotePrintServiceStub.java b/PrintServiceStubs/src/com/android/printservicestubs/RemotePrintServiceStub.java
index 89a2ba9..7e2b679 100644
--- a/PrinterVendorDiscovery/src/com/android/printerdiscovery/RemotePrintServiceStub.java
+++ b/PrintServiceStubs/src/com/android/printservicestubs/RemotePrintServiceStub.java
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.printerdiscovery;
+package com.android.printservicestubs;
 
 import android.annotation.IntRange;
 import android.annotation.NonNull;
+import android.annotation.StringRes;
 import android.net.Uri;
 import com.android.internal.util.Preconditions;
 
@@ -34,7 +35,7 @@ class RemotePrintServiceStub implements PrintServiceStub.PrinterDiscoveryCallbac
     /**
      * The name of the print service.
      */
-    private final @NonNull String mName;
+    private final @StringRes int mName;
 
     /**
      * If the print service if for more than a single vendor
@@ -79,7 +80,7 @@ class RemotePrintServiceStub implements PrintServiceStub.PrinterDiscoveryCallbac
         // We handle any throwable to isolate ourself from bugs in the stub code.
         // Cache simple properties to avoid having to deal with exceptions later in the code.
         try {
-            mName = Preconditions.checkNotNull(mStub.getName(), "name");
+            mName = Preconditions.checkArgumentPositive(mStub.getName(), "name");
             mInstallUri = Preconditions.checkNotNull(mStub.getInstallUri(), "installUri");
         } catch (Throwable e) {
             throw new StubException(mStub, "Cannot cache simple properties ", e);
@@ -93,7 +94,7 @@ class RemotePrintServiceStub implements PrintServiceStub.PrinterDiscoveryCallbac
      *
      * @return The name of the print service.
      */
-    public @NonNull String getName() {
+    public @StringRes int getName() {
         return mName;
     }
 
@@ -176,11 +177,11 @@ class RemotePrintServiceStub implements PrintServiceStub.PrinterDiscoveryCallbac
     }
 
     /**
-     * Exception thrown if the plugin has any issues.
+     * Exception thrown if the stub has any issues.
      */
     public class StubException extends Exception {
-        private StubException(PrintServiceStub plugin, String message, Throwable e) {
-            super(plugin + ": " + message, e);
+        private StubException(PrintServiceStub stub, String message, Throwable e) {
+            super(stub + ": " + message, e);
         }
     }
 }
diff --git a/PrinterVendorDiscovery/src/com/android/printerdiscovery/PrinterDiscovery.java b/PrintServiceStubs/src/com/android/printservicestubs/TestApp.java
index 3984c68..91a61d3 100644
--- a/PrinterVendorDiscovery/src/com/android/printerdiscovery/PrinterDiscovery.java
+++ b/PrintServiceStubs/src/com/android/printservicestubs/TestApp.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.printerdiscovery;
+package com.android.printservicestubs;
 
 import android.annotation.Nullable;
 import android.app.Activity;
@@ -30,9 +30,9 @@ import android.widget.*;
  * <p/>
  * TODO: Remove
  */
-public class PrinterDiscovery extends Activity implements LoaderManager.LoaderCallbacks<Cursor> {
+public class TestApp extends Activity implements LoaderManager.LoaderCallbacks<Cursor> {
     /**
-     * Adapter connecting the {@link R.layout#printer_discovery R.layout.printer_discovery} to the
+     * Adapter connecting the {@link R.layout#test_app R.layout.test_app} to the
      * {@link PrintServiceStubProvider}.
      */
     private SimpleCursorAdapter mAdapter;
@@ -41,14 +41,14 @@ public class PrinterDiscovery extends Activity implements LoaderManager.LoaderCa
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        setContentView(R.layout.printer_discovery);
+        setContentView(R.layout.test_app);
 
         mAdapter = new SimpleCursorAdapter(this, android.R.layout.simple_list_item_2, null,
                 new String[] { PrintServiceStubContract.PrintServiceStubs.NAME,
                         PrintServiceStubContract.PrintServiceStubs.NUM_DISCOVERED_PRINTERS
                 }, new int[] { android.R.id.text1, android.R.id.text2 }, 0);
 
-        ((ListView) findViewById(R.id.discovered_printers)).setAdapter(mAdapter);
+        ((ListView) findViewById(R.id.print_service_stubs)).setAdapter(mAdapter);
 
         getLoaderManager().initLoader(0, null, this);
     }
diff --git a/PrinterVendorDiscovery/src/com/android/printerdiscovery/VendorConfig.java b/PrintServiceStubs/src/com/android/printservicestubs/VendorConfig.java
index a5bf3a8..31ef3f5 100644
--- a/PrinterVendorDiscovery/src/com/android/printerdiscovery/VendorConfig.java
+++ b/PrintServiceStubs/src/com/android/printservicestubs/VendorConfig.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.printerdiscovery;
+package com.android.printservicestubs;
 
 import android.annotation.NonNull;
 import android.annotation.Nullable;
@@ -159,13 +159,13 @@ public class VendorConfig {
      * @throws XmlPullParserException
      */
     private static @NonNull String readSimpleTag(@NonNull Context context,
-            @NonNull XmlPullParser parser, @NonNull String tagName)
+            @NonNull XmlPullParser parser, @NonNull String tagName, boolean resolveReferences)
             throws IOException, XmlPullParserException {
         parser.require(XmlPullParser.START_TAG, null, tagName);
         String text = readText(parser);
         parser.require(XmlPullParser.END_TAG, null, tagName);
 
-        if (text.startsWith("@")) {
+        if (resolveReferences && text.startsWith("@")) {
             return context.getResources().getString(
                     context.getResources().getIdentifier(text, null, context.getPackageName()));
         } else {
@@ -278,17 +278,17 @@ public class VendorConfig {
 
             switch (subTagName) {
                 case NAME_TAG:
-                    name = readSimpleTag(context, parser, NAME_TAG);
+                    name = readSimpleTag(context, parser, NAME_TAG, false);
                     break;
                 case PACKAGE_TAG:
-                    packageName = readSimpleTag(context, parser, PACKAGE_TAG);
+                    packageName = readSimpleTag(context, parser, PACKAGE_TAG, true);
                     break;
                 case MDNSNAMES_TAG:
                     mDNSNames = readTagList(parser, MDNSNAMES_TAG, MDNSNAME_TAG,
                             new TagReader<String>() {
                                 public String readTag(XmlPullParser parser, String tagName)
                                         throws XmlPullParserException, IOException {
-                                    return readSimpleTag(context, parser, tagName);
+                                    return readSimpleTag(context, parser, tagName, true);
                                 }
                             }
                     );
diff --git a/PrinterVendorDiscovery/src/com/android/printerdiscovery/servicediscovery/DiscoveryListener.java b/PrintServiceStubs/src/com/android/printservicestubs/servicediscovery/DiscoveryListener.java
index 1e4648d..ffd53ee 100644
--- a/PrinterVendorDiscovery/src/com/android/printerdiscovery/servicediscovery/DiscoveryListener.java
+++ b/PrintServiceStubs/src/com/android/printservicestubs/servicediscovery/DiscoveryListener.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.android.printerdiscovery.servicediscovery;
+package com.android.printservicestubs.servicediscovery;
 
 import android.annotation.NonNull;
 
diff --git a/PrinterVendorDiscovery/src/com/android/printerdiscovery/servicediscovery/IDiscovery.java b/PrintServiceStubs/src/com/android/printservicestubs/servicediscovery/IDiscovery.java
index 6b9e023..f295a87 100644
--- a/PrinterVendorDiscovery/src/com/android/printerdiscovery/servicediscovery/IDiscovery.java
+++ b/PrintServiceStubs/src/com/android/printservicestubs/servicediscovery/IDiscovery.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.android.printerdiscovery.servicediscovery;
+package com.android.printservicestubs.servicediscovery;
 
 import java.net.DatagramPacket;
 import java.net.UnknownHostException;
diff --git a/PrinterVendorDiscovery/src/com/android/printerdiscovery/servicediscovery/NetworkDevice.java b/PrintServiceStubs/src/com/android/printservicestubs/servicediscovery/NetworkDevice.java
index 3bd21d2..42a7aba 100644
--- a/PrinterVendorDiscovery/src/com/android/printerdiscovery/servicediscovery/NetworkDevice.java
+++ b/PrintServiceStubs/src/com/android/printservicestubs/servicediscovery/NetworkDevice.java
@@ -15,21 +15,19 @@
  * limitations under the License.
  */
 
-package com.android.printerdiscovery.servicediscovery;
+package com.android.printservicestubs.servicediscovery;
 
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.text.TextUtils;
 
-import com.android.printerdiscovery.servicediscovery.mdns.BonjourParser;
+import com.android.printservicestubs.servicediscovery.mdns.BonjourParser;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Locale;
 
 /**
  * There is no public constructor. Instances are either returned by the printer
diff --git a/PrinterVendorDiscovery/src/com/android/printerdiscovery/servicediscovery/NetworkDiscovery.java b/PrintServiceStubs/src/com/android/printservicestubs/servicediscovery/NetworkDiscovery.java
index be7b4fc..b7b1c6b 100644
--- a/PrinterVendorDiscovery/src/com/android/printerdiscovery/servicediscovery/NetworkDiscovery.java
+++ b/PrintServiceStubs/src/com/android/printservicestubs/servicediscovery/NetworkDiscovery.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package com.android.printerdiscovery.servicediscovery;
+package com.android.printservicestubs.servicediscovery;
 
 import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.content.Context;
 import com.android.internal.util.Preconditions;
-import com.android.printerdiscovery.R;
-import com.android.printerdiscovery.servicediscovery.mdns.MDnsDiscovery;
+import com.android.printservicestubs.R;
+import com.android.printservicestubs.servicediscovery.mdns.MDnsDiscovery;
 
 import java.io.IOException;
 import java.net.DatagramPacket;
diff --git a/PrinterVendorDiscovery/src/com/android/printerdiscovery/servicediscovery/NetworkUtils.java b/PrintServiceStubs/src/com/android/printservicestubs/servicediscovery/NetworkUtils.java
index 66688df..8cf0ce6 100644
--- a/PrinterVendorDiscovery/src/com/android/printerdiscovery/servicediscovery/NetworkUtils.java
+++ b/PrintServiceStubs/src/com/android/printservicestubs/servicediscovery/NetworkUtils.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.android.printerdiscovery.servicediscovery;
+package com.android.printservicestubs.servicediscovery;
 
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
diff --git a/PrinterVendorDiscovery/src/com/android/printerdiscovery/servicediscovery/ServiceParser.java b/PrintServiceStubs/src/com/android/printservicestubs/servicediscovery/ServiceParser.java
index 188fd8e..f08b48d 100644
--- a/PrinterVendorDiscovery/src/com/android/printerdiscovery/servicediscovery/ServiceParser.java
+++ b/PrintServiceStubs/src/com/android/printservicestubs/servicediscovery/ServiceParser.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.android.printerdiscovery.servicediscovery;
+package com.android.printservicestubs.servicediscovery;
 
 import android.os.Bundle;
 
diff --git a/PrinterVendorDiscovery/src/com/android/printerdiscovery/servicediscovery/mdns/BonjourException.java b/PrintServiceStubs/src/com/android/printservicestubs/servicediscovery/mdns/BonjourException.java
index ec39c90..f6cb447 100644
--- a/PrinterVendorDiscovery/src/com/android/printerdiscovery/servicediscovery/mdns/BonjourException.java
+++ b/PrintServiceStubs/src/com/android/printservicestubs/servicediscovery/mdns/BonjourException.java
@@ -18,7 +18,7 @@
 /**
  *
  */
-package com.android.printerdiscovery.servicediscovery.mdns;
+package com.android.printservicestubs.servicediscovery.mdns;
 
 @SuppressWarnings({"serial", "unused"})
 class BonjourException extends DnsException {
diff --git a/PrinterVendorDiscovery/src/com/android/printerdiscovery/servicediscovery/mdns/BonjourParser.java b/PrintServiceStubs/src/com/android/printservicestubs/servicediscovery/mdns/BonjourParser.java
index e005de7..78b91b5 100644
--- a/PrinterVendorDiscovery/src/com/android/printerdiscovery/servicediscovery/mdns/BonjourParser.java
+++ b/PrintServiceStubs/src/com/android/printservicestubs/servicediscovery/mdns/BonjourParser.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package com.android.printerdiscovery.servicediscovery.mdns;
+package com.android.printservicestubs.servicediscovery.mdns;
 
 import android.os.Bundle;
 import android.text.TextUtils;
 
-import com.android.printerdiscovery.servicediscovery.NetworkDevice;
+import com.android.printservicestubs.servicediscovery.NetworkDevice;
 
 import java.io.UnsupportedEncodingException;
 import java.net.InetAddress;
diff --git a/PrinterVendorDiscovery/src/com/android/printerdiscovery/servicediscovery/mdns/BonjourServiceParser.java b/PrintServiceStubs/src/com/android/printservicestubs/servicediscovery/mdns/BonjourServiceParser.java
index 04826dc..5cd03f0 100644
--- a/PrinterVendorDiscovery/src/com/android/printerdiscovery/servicediscovery/mdns/BonjourServiceParser.java
+++ b/PrintServiceStubs/src/com/android/printservicestubs/servicediscovery/mdns/BonjourServiceParser.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package com.android.printerdiscovery.servicediscovery.mdns;
+package com.android.printservicestubs.servicediscovery.mdns;
 
 import android.os.Bundle;
 
-import com.android.printerdiscovery.servicediscovery.ServiceParser;
+import com.android.printservicestubs.servicediscovery.ServiceParser;
 
 @SuppressWarnings("unused")
 interface BonjourServiceParser extends ServiceParser {
diff --git a/PrinterVendorDiscovery/src/com/android/printerdiscovery/servicediscovery/mdns/DnsException.java b/PrintServiceStubs/src/com/android/printservicestubs/servicediscovery/mdns/DnsException.java
index b19cd3a..d23da0d 100644
--- a/PrinterVendorDiscovery/src/com/android/printerdiscovery/servicediscovery/mdns/DnsException.java
+++ b/PrintServiceStubs/src/com/android/printservicestubs/servicediscovery/mdns/DnsException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.android.printerdiscovery.servicediscovery.mdns;
+package com.android.printservicestubs.servicediscovery.mdns;
 
 @SuppressWarnings("serial")
 class DnsException extends Exception {
diff --git a/PrinterVendorDiscovery/src/com/android/printerdiscovery/servicediscovery/mdns/DnsPacket.java b/PrintServiceStubs/src/com/android/printservicestubs/servicediscovery/mdns/DnsPacket.java
index 83d3319..cc58ed9 100644
--- a/PrinterVendorDiscovery/src/com/android/printerdiscovery/servicediscovery/mdns/DnsPacket.java
+++ b/PrintServiceStubs/src/com/android/printservicestubs/servicediscovery/mdns/DnsPacket.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.android.printerdiscovery.servicediscovery.mdns;
+package com.android.printservicestubs.servicediscovery.mdns;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/PrinterVendorDiscovery/src/com/android/printerdiscovery/servicediscovery/mdns/DnsParser.java b/PrintServiceStubs/src/com/android/printservicestubs/servicediscovery/mdns/DnsParser.java
index 5995e6e..7d80ca4 100644
--- a/PrinterVendorDiscovery/src/com/android/printerdiscovery/servicediscovery/mdns/DnsParser.java
+++ b/PrintServiceStubs/src/com/android/printservicestubs/servicediscovery/mdns/DnsParser.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.android.printerdiscovery.servicediscovery.mdns;
+package com.android.printservicestubs.servicediscovery.mdns;
 
 import java.io.UnsupportedEncodingException;
 import java.net.DatagramPacket;
diff --git a/PrinterVendorDiscovery/src/com/android/printerdiscovery/servicediscovery/mdns/DnsSdException.java b/PrintServiceStubs/src/com/android/printservicestubs/servicediscovery/mdns/DnsSdException.java
index 1e947bf..a13c208 100644
--- a/PrinterVendorDiscovery/src/com/android/printerdiscovery/servicediscovery/mdns/DnsSdException.java
+++ b/PrintServiceStubs/src/com/android/printservicestubs/servicediscovery/mdns/DnsSdException.java
@@ -18,7 +18,7 @@
 /**
  *
  */
-package com.android.printerdiscovery.servicediscovery.mdns;
+package com.android.printservicestubs.servicediscovery.mdns;
 
 @SuppressWarnings("serial")
 class DnsSdException extends DnsException {
diff --git a/PrinterVendorDiscovery/src/com/android/printerdiscovery/servicediscovery/mdns/DnsSdParser.java b/PrintServiceStubs/src/com/android/printservicestubs/servicediscovery/mdns/DnsSdParser.java
index 8c0de3f..6319315 100644
--- a/PrinterVendorDiscovery/src/com/android/printerdiscovery/servicediscovery/mdns/DnsSdParser.java
+++ b/PrintServiceStubs/src/com/android/printservicestubs/servicediscovery/mdns/DnsSdParser.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.android.printerdiscovery.servicediscovery.mdns;
+package com.android.printservicestubs.servicediscovery.mdns;
 
 import android.util.Log;
 
diff --git a/PrinterVendorDiscovery/src/com/android/printerdiscovery/servicediscovery/mdns/DnsService.java b/PrintServiceStubs/src/com/android/printservicestubs/servicediscovery/mdns/DnsService.java
index 8c8ea5e..4b2b588 100644
--- a/PrinterVendorDiscovery/src/com/android/printerdiscovery/servicediscovery/mdns/DnsService.java
+++ b/PrintServiceStubs/src/com/android/printservicestubs/servicediscovery/mdns/DnsService.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.android.printerdiscovery.servicediscovery.mdns;
+package com.android.printservicestubs.servicediscovery.mdns;
 
 import java.util.Map;
 
diff --git a/PrinterVendorDiscovery/src/com/android/printerdiscovery/servicediscovery/mdns/MDNSUtils.java b/PrintServiceStubs/src/com/android/printservicestubs/servicediscovery/mdns/MDNSUtils.java
index 8dc67fb..81db89f 100644
--- a/PrinterVendorDiscovery/src/com/android/printerdiscovery/servicediscovery/mdns/MDNSUtils.java
+++ b/PrintServiceStubs/src/com/android/printservicestubs/servicediscovery/mdns/MDNSUtils.java
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package com.android.printerdiscovery.servicediscovery.mdns;
+package com.android.printservicestubs.servicediscovery.mdns;
 
 import android.annotation.NonNull;
 import android.os.Bundle;
 
 import com.android.internal.util.Preconditions;
-import com.android.printerdiscovery.servicediscovery.NetworkDevice;
+import com.android.printservicestubs.servicediscovery.NetworkDevice;
 
 import java.util.ArrayList;
 import java.util.Locale;
diff --git a/PrinterVendorDiscovery/src/com/android/printerdiscovery/servicediscovery/mdns/MDnsDiscovery.java b/PrintServiceStubs/src/com/android/printservicestubs/servicediscovery/mdns/MDnsDiscovery.java
index bc1374c..73b3b5e 100644
--- a/PrinterVendorDiscovery/src/com/android/printerdiscovery/servicediscovery/mdns/MDnsDiscovery.java
+++ b/PrintServiceStubs/src/com/android/printservicestubs/servicediscovery/mdns/MDnsDiscovery.java
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package com.android.printerdiscovery.servicediscovery.mdns;
+package com.android.printservicestubs.servicediscovery.mdns;
 
 import android.text.TextUtils;
 import android.util.Pair;
 
-import com.android.printerdiscovery.servicediscovery.IDiscovery;
-import com.android.printerdiscovery.servicediscovery.ServiceParser;
+import com.android.printservicestubs.servicediscovery.IDiscovery;
+import com.android.printservicestubs.servicediscovery.ServiceParser;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/PrinterVendorDiscovery/src/com/android/printerdiscovery/stubs/gcp/GoogleCloudPrintStub.java b/PrintServiceStubs/src/com/android/printservicestubs/stubs/gcp/GoogleCloudPrintStub.java
index b73e2ff..db59373 100644
--- a/PrinterVendorDiscovery/src/com/android/printerdiscovery/stubs/gcp/GoogleCloudPrintStub.java
+++ b/PrintServiceStubs/src/com/android/printservicestubs/stubs/gcp/GoogleCloudPrintStub.java
@@ -15,20 +15,21 @@
  * limitations under the License.
  */
 
-package com.android.printerdiscovery.stubs.gcp;
+package com.android.printservicestubs.stubs.gcp;
 
 import android.annotation.NonNull;
+import android.annotation.StringRes;
 import android.content.Context;
 import android.net.Uri;
 import android.text.TextUtils;
 import android.util.Log;
 import com.android.internal.util.Preconditions;
-import com.android.printerdiscovery.PrintServiceStub;
-import com.android.printerdiscovery.R;
-import com.android.printerdiscovery.VendorConfig;
-import com.android.printerdiscovery.servicediscovery.DiscoveryListener;
-import com.android.printerdiscovery.servicediscovery.NetworkDevice;
-import com.android.printerdiscovery.servicediscovery.NetworkDiscovery;
+import com.android.printservicestubs.PrintServiceStub;
+import com.android.printservicestubs.R;
+import com.android.printservicestubs.VendorConfig;
+import com.android.printservicestubs.servicediscovery.DiscoveryListener;
+import com.android.printservicestubs.servicediscovery.NetworkDevice;
+import com.android.printservicestubs.servicediscovery.NetworkDiscovery;
 import org.xmlpull.v1.XmlPullParserException;
 
 import java.io.IOException;
@@ -72,8 +73,7 @@ public class GoogleCloudPrintStub implements PrintServiceStub, DiscoveryListener
     public @NonNull Uri getInstallUri() {
         VendorConfig config = null;
         try {
-            config = VendorConfig.getConfig(mContext,
-                    mContext.getString(R.string.plugin_vendor_gcp));
+            config = VendorConfig.getConfig(mContext, "@string/plugin_vendor_gcp");
         } catch (IOException | XmlPullParserException e) {
             Log.e(LOG_TAG, "Error reading vendor config", e);
         }
@@ -89,8 +89,8 @@ public class GoogleCloudPrintStub implements PrintServiceStub, DiscoveryListener
     }
 
     @Override
-    public @NonNull String getName() {
-        return mContext.getString(R.string.plugin_vendor_gcp);
+    public @StringRes int getName() {
+        return R.string.plugin_vendor_gcp;
     }
 
     @Override
diff --git a/PrinterVendorDiscovery/src/com/android/printerdiscovery/stubs/mdnsFilter/MDNSFilterStub.java b/PrintServiceStubs/src/com/android/printservicestubs/stubs/mdnsFilter/MDNSFilterStub.java
index 9264049..a0a031a 100644
--- a/PrinterVendorDiscovery/src/com/android/printerdiscovery/stubs/mdnsFilter/MDNSFilterStub.java
+++ b/PrintServiceStubs/src/com/android/printservicestubs/stubs/mdnsFilter/MDNSFilterStub.java
@@ -14,18 +14,19 @@
  * limitations under the License.
  */
 
-package com.android.printerdiscovery.stubs.mdnsFilter;
+package com.android.printservicestubs.stubs.mdnsFilter;
 
 import android.annotation.NonNull;
+import android.annotation.StringRes;
 import android.content.Context;
 import android.net.Uri;
 import com.android.internal.util.Preconditions;
-import com.android.printerdiscovery.PrintServiceStub;
-import com.android.printerdiscovery.R;
-import com.android.printerdiscovery.servicediscovery.DiscoveryListener;
-import com.android.printerdiscovery.servicediscovery.NetworkDevice;
-import com.android.printerdiscovery.servicediscovery.NetworkDiscovery;
-import com.android.printerdiscovery.servicediscovery.mdns.MDNSUtils;
+import com.android.printservicestubs.PrintServiceStub;
+import com.android.printservicestubs.R;
+import com.android.printservicestubs.servicediscovery.DiscoveryListener;
+import com.android.printservicestubs.servicediscovery.NetworkDevice;
+import com.android.printservicestubs.servicediscovery.NetworkDiscovery;
+import com.android.printservicestubs.servicediscovery.mdns.MDNSUtils;
 
 import java.util.HashSet;
 import java.util.List;
@@ -38,7 +39,7 @@ public class MDNSFilterStub implements PrintServiceStub, DiscoveryListener {
     /**
      * Name of the print service this stub is for
      */
-    private final @NonNull String mName;
+    private final @StringRes int mName;
 
     /**
      * Uri to install the print service this stub is for
@@ -77,7 +78,8 @@ public class MDNSFilterStub implements PrintServiceStub, DiscoveryListener {
     public MDNSFilterStub(@NonNull Context context, @NonNull String name,
             @NonNull String packageName, @NonNull List<String> mDNSNames) {
         mContext = Preconditions.checkNotNull(context, "context");
-        mName = Preconditions.checkNotNull(name, "name");
+        mName = mContext.getResources().getIdentifier(Preconditions.checkNotNull(name, "name"),
+                null, mContext.getPackageName());
         mInstallPackage = Uri.parse(context.getString(R.string.uri_package_details,
                 Preconditions.checkNotNull(packageName, "packageName")));
         mMDNSNames = new HashSet<>(Preconditions
@@ -100,7 +102,7 @@ public class MDNSFilterStub implements PrintServiceStub, DiscoveryListener {
     }
 
     @Override
-    public @NonNull String getName() {
+    public @StringRes int getName() {
         return mName;
     }
 
diff --git a/PrinterVendorDiscovery/src/com/android/printerdiscovery/stubs/mopria/MopriaStub.java b/PrintServiceStubs/src/com/android/printservicestubs/stubs/mopria/MopriaStub.java
index 77dc7a4..ce7aa39 100644
--- a/PrinterVendorDiscovery/src/com/android/printerdiscovery/stubs/mopria/MopriaStub.java
+++ b/PrintServiceStubs/src/com/android/printservicestubs/stubs/mopria/MopriaStub.java
@@ -15,20 +15,21 @@
  * limitations under the License.
  */
 
-package com.android.printerdiscovery.stubs.mopria;
+package com.android.printservicestubs.stubs.mopria;
 
 import android.annotation.NonNull;
+import android.annotation.StringRes;
 import android.content.Context;
 import android.net.Uri;
 import android.text.TextUtils;
 import android.util.Log;
 import com.android.internal.util.Preconditions;
-import com.android.printerdiscovery.PrintServiceStub;
-import com.android.printerdiscovery.R;
-import com.android.printerdiscovery.VendorConfig;
-import com.android.printerdiscovery.servicediscovery.DiscoveryListener;
-import com.android.printerdiscovery.servicediscovery.NetworkDevice;
-import com.android.printerdiscovery.servicediscovery.NetworkDiscovery;
+import com.android.printservicestubs.PrintServiceStub;
+import com.android.printservicestubs.R;
+import com.android.printservicestubs.VendorConfig;
+import com.android.printservicestubs.servicediscovery.DiscoveryListener;
+import com.android.printservicestubs.servicediscovery.NetworkDevice;
+import com.android.printservicestubs.servicediscovery.NetworkDiscovery;
 import org.xmlpull.v1.XmlPullParserException;
 
 import java.io.IOException;
@@ -74,8 +75,7 @@ public class MopriaStub implements PrintServiceStub, DiscoveryListener {
     public @NonNull Uri getInstallUri() {
         VendorConfig config = null;
         try {
-            config = VendorConfig.getConfig(mContext,
-                    mContext.getString(R.string.plugin_vendor_mopria));
+            config = VendorConfig.getConfig(mContext, "@string/plugin_vendor_mopria");
         } catch (IOException | XmlPullParserException e) {
             Log.e(LOG_TAG, "Error reading vendor config", e);
         }
@@ -90,8 +90,8 @@ public class MopriaStub implements PrintServiceStub, DiscoveryListener {
     }
 
     @Override
-    public @NonNull String getName() {
-        return mContext.getString(R.string.plugin_vendor_mopria);
+    public @StringRes int getName() {
+        return R.string.plugin_vendor_mopria;
     }
 
     @Override