diff options
| -rwxr-xr-x | res/values/strings.xml | 4 | ||||
| -rw-r--r-- | src/com/google/zxing/client/android/result/ProductResultHandler.java (renamed from src/com/google/zxing/client/android/result/UPCResultHandler.java) | 12 | ||||
| -rw-r--r-- | src/com/google/zxing/client/android/result/ResultHandlerFactory.java | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index b5745124..f1377d1f 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -81,10 +81,10 @@ <string name="result_email_address">Found email address</string> <string name="result_geo">Found geographic coordinates</string> <string name="result_isbn">Found book</string> + <string name="result_product">Found product</string> <string name="result_sms">Found SMS address</string> <string name="result_tel">Found phone number</string> <string name="result_text">Found plain text</string> - <string name="result_upc">Found product</string> <string name="result_uri">Found URL</string> <string name="sbc_name">Google Book Search</string> @@ -93,5 +93,5 @@ <string name="title_help">Help</string> <string name="zxing_url">http://code.google.com/p/zxing</string> - <string name="zxing_user_agent">ZXing-Android/1.0</string> + <string name="zxing_user_agent">ZXing-Android/1.1</string> </resources> diff --git a/src/com/google/zxing/client/android/result/UPCResultHandler.java b/src/com/google/zxing/client/android/result/ProductResultHandler.java index 44ecd228..bd21684c 100644 --- a/src/com/google/zxing/client/android/result/UPCResultHandler.java +++ b/src/com/google/zxing/client/android/result/ProductResultHandler.java @@ -21,14 +21,14 @@ import com.google.zxing.client.android.R; import com.google.zxing.client.result.ParsedResult; import com.google.zxing.client.result.ProductParsedResult; -public class UPCResultHandler extends ResultHandler { +public class ProductResultHandler extends ResultHandler { private static final int[] mButtons = { R.string.button_product_search, R.string.button_web_search }; - public UPCResultHandler(Activity activity, ParsedResult result) { + public ProductResultHandler(Activity activity, ParsedResult result) { super(activity, result); } @@ -41,19 +41,19 @@ public class UPCResultHandler extends ResultHandler { } public void handleButtonPress(int index) { - ProductParsedResult upcResult = (ProductParsedResult) mResult; + ProductParsedResult productResult = (ProductParsedResult) mResult; switch (index) { case 0: - openProductSearch(upcResult.getNormalizedProductID()); + openProductSearch(productResult.getNormalizedProductID()); break; case 1: - webSearch(upcResult.getNormalizedProductID()); + webSearch(productResult.getNormalizedProductID()); break; } } public int getDisplayTitle() { - return R.string.result_upc; + return R.string.result_product; } } diff --git a/src/com/google/zxing/client/android/result/ResultHandlerFactory.java b/src/com/google/zxing/client/android/result/ResultHandlerFactory.java index 0470baef..f53cad84 100644 --- a/src/com/google/zxing/client/android/result/ResultHandlerFactory.java +++ b/src/com/google/zxing/client/android/result/ResultHandlerFactory.java @@ -32,7 +32,7 @@ public class ResultHandlerFactory { } else if (type.equals(ParsedResultType.EMAIL_ADDRESS)) { return new EmailAddressResultHandler(activity, result); } else if (type.equals(ParsedResultType.PRODUCT)) { - return new UPCResultHandler(activity, result); + return new ProductResultHandler(activity, result); } else if (type.equals(ParsedResultType.URI)) { return new URIResultHandler(activity, result); } else if (type.equals(ParsedResultType.TEXT)) { |