WIth Lee (Wildfire owner) helping found the cause -- bizarre issue with Wildfire where it can't find a UI element. Disabling it for these devices.

git-svn-id: https://zxing.googlecode.com/svn/trunk@1642 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2010-11-12 01:24:55 +00:00
parent 5798f40398
commit edfb04b96d

View file

@ -491,10 +491,14 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
contentsTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, scaledSize); contentsTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, scaledSize);
TextView supplementTextView = (TextView) findViewById(R.id.contents_supplement_text_view); TextView supplementTextView = (TextView) findViewById(R.id.contents_supplement_text_view);
supplementTextView.setText(""); if (supplementTextView != null) {
supplementTextView.setOnClickListener(null); supplementTextView.setText("");
if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean(PreferencesActivity.KEY_SUPPLEMENTAL, true)) { supplementTextView.setOnClickListener(null);
SupplementalInfoRetriever.maybeInvokeRetrieval(supplementTextView, resultHandler.getResult(), handler, this); if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean(PreferencesActivity.KEY_SUPPLEMENTAL, true)) {
SupplementalInfoRetriever.maybeInvokeRetrieval(supplementTextView, resultHandler.getResult(), handler, this);
}
} else {
Log.w(TAG, "Unable to find supplement text view?");
} }
int buttonCount = resultHandler.getButtonCount(); int buttonCount = resultHandler.getButtonCount();