mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2024-11-10 04:54:04 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Probably much better fix that Lachezar spotted -- LDPI layout wasn't correctly updated by me

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1644 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2010-11-12 15:45:58 +00:00
parent 51a4fa443d
commit 682cc4c98c
2 changed files with 29 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
android/res/layout-ldpi/capture.xml
View file

@ -154,14 +154,31 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<TextView android:id="@+id/contents_text_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/result_text"
android:textColorLink="@color/result_text"
android:textSize="22sp"
android:paddingLeft="12dip"
android:autoLink="web"/>
<LinearLayout
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<TextView android:id="@+id/contents_text_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/result_text"
android:textColorLink="@color/result_text"
android:textSize="22sp"
android:paddingLeft="12dip"
android:autoLink="web"/>
<TextView android:id="@+id/contents_supplement_text_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/result_text"
android:textColorLink="@color/result_text"
android:textSize="14sp"
android:padding="24dip"
android:autoLink="web"
android:clickable="true"/>
</LinearLayout>
</ScrollView>

12
android/src/com/google/zxing/client/android/CaptureActivity.java
View file

@ -491,14 +491,10 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
contentsTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, scaledSize);
TextView supplementTextView = (TextView) findViewById(R.id.contents_supplement_text_view);
if (supplementTextView != null) {
supplementTextView.setText("");
supplementTextView.setOnClickListener(null);
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?");
supplementTextView.setText("");
supplementTextView.setOnClickListener(null);
if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean(PreferencesActivity.KEY_SUPPLEMENTAL, true)) {
SupplementalInfoRetriever.maybeInvokeRetrieval(supplementTextView, resultHandler.getResult(), handler, this);
}
int buttonCount = resultHandler.getButtonCount();