projects
/
zxing.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Small style stuff
[zxing.git]
/
android
/
src
/
com
/
google
/
zxing
/
client
/
android
/
result
/
TextResultHandler.java
diff --git
a/android/src/com/google/zxing/client/android/result/TextResultHandler.java
b/android/src/com/google/zxing/client/android/result/TextResultHandler.java
index
57e621c
..
8315342
100644
(file)
--- a/
android/src/com/google/zxing/client/android/result/TextResultHandler.java
+++ b/
android/src/com/google/zxing/client/android/result/TextResultHandler.java
@@
-16,49
+16,60
@@
package com.google.zxing.client.android.result;
package com.google.zxing.client.android.result;
-import android.app.Activity;
import com.google.zxing.client.android.R;
import com.google.zxing.client.result.ParsedResult;
import com.google.zxing.client.android.R;
import com.google.zxing.client.result.ParsedResult;
+import android.app.Activity;
+
/**
/**
- * This class handles TextParsedResult as well as unknown formats.
+ * This class handles TextParsedResult as well as unknown formats. It's the fallback handler.
+ *
+ * @author dswitkin@google.com (Daniel Switkin)
*/
public final class TextResultHandler extends ResultHandler {
*/
public final class TextResultHandler extends ResultHandler {
- private static final int[]
mB
uttons = {
+ private static final int[]
b
uttons = {
R.string.button_web_search,
R.string.button_share_by_email,
R.string.button_web_search,
R.string.button_share_by_email,
- R.string.button_share_by_sms
+ R.string.button_share_by_sms,
+ R.string.button_custom_product_search,
};
public TextResultHandler(Activity activity, ParsedResult result) {
super(activity, result);
}
};
public TextResultHandler(Activity activity, ParsedResult result) {
super(activity, result);
}
+ @Override
public int getButtonCount() {
public int getButtonCount() {
- return
mButtons.length
;
+ return
hasCustomProductSearch() ? buttons.length : buttons.length - 1
;
}
}
+ @Override
public int getButtonText(int index) {
public int getButtonText(int index) {
- return
mB
uttons[index];
+ return
b
uttons[index];
}
}
+ @Override
public void handleButtonPress(int index) {
public void handleButtonPress(int index) {
+ String text = getResult().getDisplayResult();
switch (index) {
case 0:
switch (index) {
case 0:
- webSearch(
mResult.getDisplayResult()
);
+ webSearch(
text
);
break;
case 1:
break;
case 1:
- shareByEmail(
mResult.getDisplayResult()
);
+ shareByEmail(
text
);
break;
case 2:
break;
case 2:
- shareBySMS(mResult.getDisplayResult());
+ shareBySMS(text);
+ break;
+ case 3:
+ openURL(fillInCustomSearchURL(text));
break;
}
}
break;
}
}
+ @Override
public int getDisplayTitle() {
return R.string.result_text;
}
public int getDisplayTitle() {
return R.string.result_text;
}
-
}
}