[SCM] Multi-format 1D/2D barcode image processing library branch, upstream, updated. 24d4480bc48cf9eabf7b2bd2f528248b0e458809
srowen
srowen at 59b500cc-1b3d-0410-9834-0bbf25fbcc57
Wed Aug 4 01:32:06 UTC 2010
The following commit has been merged in the upstream branch:
commit e0eb285fd67be9e42787dae40d08a114bd0ac3ab
Author: srowen <srowen at 59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date: Tue Jun 15 22:08:02 2010 +0000
Oops remove bar again
git-svn-id: http://zxing.googlecode.com/svn/trunk@1433 59b500cc-1b3d-0410-9834-0bbf25fbcc57
diff --git a/android/res/layout/capture.xml b/android/res/layout/capture.xml
index dc5a533..fd8ab7e 100755
--- a/android/res/layout/capture.xml
+++ b/android/res/layout/capture.xml
@@ -179,20 +179,13 @@
</LinearLayout>
- <LinearLayout android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:background="@color/part_transparent"
- android:layout_gravity="bottom"
- android:gravity="center">
-
- <TextView android:id="@+id/status_view"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/msg_default_status"
- android:textColor="@color/status_text"
- android:textSize="14sp"/>
-
- </LinearLayout>
+ <TextView android:id="@+id/status_view"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom|center_horizontal"
+ android:background="@color/transparent"
+ android:text="@string/msg_default_status"
+ android:textColor="@color/status_text"
+ android:textSize="14sp"/>
</FrameLayout>
diff --git a/android/res/values/colors.xml b/android/res/values/colors.xml
index e190e18..1872d5b 100755
--- a/android/res/values/colors.xml
+++ b/android/res/values/colors.xml
@@ -36,7 +36,6 @@
<color name="status_view">#50000000</color>
<color name="status_text">#ffffffff</color>
<color name="transparent">#00000000</color>
- <color name="part_transparent">#7f000000</color>
<color name="viewfinder_frame">#ff000000</color>
<color name="viewfinder_laser">#ffff0000</color>
<color name="viewfinder_mask">#60000000</color>
--
Multi-format 1D/2D barcode image processing library
More information about the Pkg-google-commits
mailing list