mirror of
https://github.com/zxing/zxing.git
synced 2025-02-02 05:41:08 -08:00
- Centered the results UI to look better on tablets.
- Other minor polish. - Bumped the version to 3.54 beta 1. git-svn-id: https://zxing.googlecode.com/svn/trunk@1737 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
dswitkin@google.com
parent
4b84ad8a40
commit
0dbfc11aa3
|
|
@ -20,8 +20,8 @@ version to be published. The next versionCode will be 7, regardless of whether t
|
|||
versionName is 2.31, 2.4, or 3.0. -->
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.google.zxing.client.android"
|
||||
android:versionName="3.53"
|
||||
android:versionCode="67"
|
||||
android:versionName="3.54 beta 1"
|
||||
android:versionCode="68"
|
||||
android:installLocation="auto">
|
||||
<!-- We require Cupcake (Android 1.5) or later, but are really targeting Donut. -->
|
||||
<uses-sdk android:minSdkVersion="3"
|
||||
|
|
|
|||
|
|
@ -4,6 +4,12 @@
|
|||
<link rel="stylesheet" href="style.css" type="text/css"/>
|
||||
</head>
|
||||
<body>
|
||||
<p><b>New in version 3.54:</b></p>
|
||||
<ul>
|
||||
<li>Fixed support for the Motorola Xoom tablet.</li>
|
||||
<li>Added Hebrew translation.</li>
|
||||
<li>Other minor fixes.</li>
|
||||
</ul>
|
||||
<p><b>New in version 3.53:</b></p>
|
||||
<ul>
|
||||
<li>Added support for 16 and 24 digit ITF codes.</li>
|
||||
|
|
|
|||
|
|
@ -190,32 +190,32 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:gravity="center">
|
||||
|
||||
<Button android:layout_width="0sp"
|
||||
<Button android:layout_width="0dip"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:textSize="14sp"
|
||||
android:visibility="gone"/>
|
||||
|
||||
<Button android:layout_width="0sp"
|
||||
<Button android:layout_width="0dip"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:textSize="14sp"
|
||||
android:visibility="gone"/>
|
||||
|
||||
<Button android:layout_width="0sp"
|
||||
<Button android:layout_width="0dip"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:textSize="14sp"
|
||||
android:visibility="gone"/>
|
||||
|
||||
<Button android:layout_width="0sp"
|
||||
<Button android:layout_width="0dip"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:textSize="14sp"
|
||||
android:visibility="gone"/>
|
||||
|
||||
<Button android:id="@+id/shopper_button"
|
||||
android:layout_width="0sp"
|
||||
android:layout_width="0dip"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:textSize="14sp"
|
||||
|
|
|
|||
|
|
@ -42,14 +42,14 @@
|
|||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="top"
|
||||
android:gravity="center"
|
||||
android:padding="12dip">
|
||||
|
||||
<LinearLayout
|
||||
android:orientation="vertical"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="fill_parent"
|
||||
android:gravity="right">
|
||||
android:gravity="right|center_vertical">
|
||||
|
||||
<ImageView android:id="@+id/barcode_image_view"
|
||||
android:layout_width="160dip"
|
||||
|
|
@ -151,13 +151,13 @@
|
|||
</LinearLayout>
|
||||
|
||||
<ScrollView
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<LinearLayout
|
||||
android:orientation="vertical"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content">
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
|
||||
<TextView android:id="@+id/contents_text_view"
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -185,38 +185,39 @@
|
|||
</LinearLayout>
|
||||
|
||||
<LinearLayout android:id="@+id/result_button_view"
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:gravity="center">
|
||||
|
||||
<Button android:layout_width="0sp"
|
||||
<Button android:layout_width="0dip"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:textSize="14sp"
|
||||
android:visibility="gone"/>
|
||||
|
||||
<Button android:layout_width="0sp"
|
||||
<Button android:layout_width="0dip"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:textSize="14sp"
|
||||
android:visibility="gone"/>
|
||||
|
||||
<Button android:layout_width="0sp"
|
||||
<Button android:layout_width="0dip"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:textSize="14sp"
|
||||
android:visibility="gone"/>
|
||||
|
||||
<Button android:layout_width="0sp"
|
||||
<Button android:layout_width="0dip"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:textSize="14sp"
|
||||
android:visibility="gone"/>
|
||||
|
||||
<Button android:id="@+id/shopper_button"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="0dip"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:textSize="14sp"
|
||||
android:drawableLeft="@drawable/shopper_icon"
|
||||
android:drawablePadding="4dip"
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@
|
|||
<string name="menu_history">History</string>
|
||||
<string name="menu_settings">Settings</string>
|
||||
<string name="menu_share">Share</string>
|
||||
<string name="msg_about">Based on the open source ZXing Barcode Library</string>
|
||||
<string name="msg_about">The official Android app of the open source ZXing barcode project.</string>
|
||||
<string name="msg_buggy">This device has known bugs that cause barcode scanning problems. For more information, visit http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions</string>
|
||||
<string name="msg_bulk_mode_scanned">Bulk mode: barcode scanned and saved</string>
|
||||
<string name="msg_camera_framework_bug">Sorry, the Android camera encountered a problem. You may need to restart the device.</string>
|
||||
|
|
|
|||
|
|
@ -28,11 +28,6 @@
|
|||
android:key="preferences_decode_Data_Matrix"
|
||||
android:defaultValue="true"
|
||||
android:title="@string/preferences_decode_Data_Matrix_title"/>
|
||||
<CheckBoxPreference
|
||||
android:key="preferences_reverse_image"
|
||||
android:defaultValue="false"
|
||||
android:title="@string/preferences_reverse_image_title"
|
||||
android:summary="@string/preferences_reverse_image_summary"/>
|
||||
</PreferenceCategory>
|
||||
<PreferenceCategory android:title="@string/preferences_actions_title">
|
||||
<CheckBoxPreference
|
||||
|
|
@ -64,7 +59,7 @@
|
|||
android:title="@string/preferences_custom_product_search_title"
|
||||
android:summary="@string/preferences_custom_product_search_summary"/>
|
||||
</PreferenceCategory>
|
||||
<PreferenceCategory android:title="@string/preferences_general_title">
|
||||
<PreferenceCategory android:title="@string/preferences_general_title">
|
||||
<CheckBoxPreference
|
||||
android:key="preferences_front_light"
|
||||
android:defaultValue="false"
|
||||
|
|
@ -75,5 +70,10 @@
|
|||
android:defaultValue="false"
|
||||
android:title="@string/preferences_bulk_mode_title"
|
||||
android:summary="@string/preferences_bulk_mode_summary"/>
|
||||
<CheckBoxPreference
|
||||
android:key="preferences_reverse_image"
|
||||
android:defaultValue="false"
|
||||
android:title="@string/preferences_reverse_image_title"
|
||||
android:summary="@string/preferences_reverse_image_summary"/>
|
||||
</PreferenceCategory>
|
||||
</PreferenceScreen>
|
||||
|
|
|
|||
Loading…
Reference in a new issue