mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add prefs to enable Aztec, PDF417 barcodes. Separate prefs for 1D product and 1D industrial formats.

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@3006 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2013-12-30 16:42:34 +00:00
parent c5a1861be5
commit 7ead18d172
39 changed files with 279 additions and 135 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
android/gen/com/google/zxing/client/android/R.java
View file

@ -186,48 +186,51 @@ public final class R {
public static final int preferences_copy_to_clipboard_title=0x7f0a0049;
public static final int preferences_custom_product_search_summary=0x7f0a004a;
public static final int preferences_custom_product_search_title=0x7f0a004b;
public static final int preferences_decode_1D_title=0x7f0a004c;
public static final int preferences_decode_Data_Matrix_title=0x7f0a004d;
public static final int preferences_decode_QR_title=0x7f0a004e;
public static final int preferences_device_bug_workarounds_title=0x7f0a004f;
public static final int preferences_disable_continuous_focus_summary=0x7f0a0050;
public static final int preferences_disable_continuous_focus_title=0x7f0a0051;
public static final int preferences_disable_exposure_title=0x7f0a0052;
public static final int preferences_front_light_auto=0x7f0a0055;
public static final int preferences_front_light_off=0x7f0a0056;
public static final int preferences_front_light_on=0x7f0a0057;
public static final int preferences_front_light_summary=0x7f0a0053;
public static final int preferences_front_light_title=0x7f0a0054;
public static final int preferences_general_title=0x7f0a0058;
public static final int preferences_invert_scan_summary=0x7f0a005a;
public static final int preferences_invert_scan_title=0x7f0a0059;
public static final int preferences_name=0x7f0a005b;
public static final int preferences_play_beep_title=0x7f0a005c;
public static final int preferences_remember_duplicates_summary=0x7f0a005d;
public static final int preferences_remember_duplicates_title=0x7f0a005e;
public static final int preferences_result_title=0x7f0a005f;
public static final int preferences_scanning_title=0x7f0a0060;
public static final int preferences_search_country=0x7f0a0061;
public static final int preferences_supplemental_summary=0x7f0a0064;
public static final int preferences_supplemental_title=0x7f0a0065;
public static final int preferences_try_bsplus=0x7f0a0062;
public static final int preferences_try_bsplus_summary=0x7f0a0063;
public static final int preferences_vibrate_title=0x7f0a0066;
public static final int result_address_book=0x7f0a0067;
public static final int result_calendar=0x7f0a0068;
public static final int result_email_address=0x7f0a0069;
public static final int result_geo=0x7f0a006a;
public static final int result_isbn=0x7f0a006b;
public static final int result_product=0x7f0a006c;
public static final int result_sms=0x7f0a006d;
public static final int result_tel=0x7f0a006e;
public static final int result_text=0x7f0a006f;
public static final int result_uri=0x7f0a0070;
public static final int result_wifi=0x7f0a0071;
public static final int sbc_name=0x7f0a0072;
public static final int wifi_changing_network=0x7f0a0073;
public static final int wifi_ssid_label=0x7f0a0074;
public static final int wifi_type_label=0x7f0a0075;
public static final int preferences_decode_1D_industrial_title=0x7f0a004c;
public static final int preferences_decode_1D_product_title=0x7f0a004d;
public static final int preferences_decode_Aztec_title=0x7f0a004e;
public static final int preferences_decode_Data_Matrix_title=0x7f0a004f;
public static final int preferences_decode_PDF417_title=0x7f0a0050;
public static final int preferences_decode_QR_title=0x7f0a0051;
public static final int preferences_device_bug_workarounds_title=0x7f0a0052;
public static final int preferences_disable_continuous_focus_summary=0x7f0a0053;
public static final int preferences_disable_continuous_focus_title=0x7f0a0054;
public static final int preferences_disable_exposure_title=0x7f0a0055;
public static final int preferences_front_light_auto=0x7f0a0058;
public static final int preferences_front_light_off=0x7f0a0059;
public static final int preferences_front_light_on=0x7f0a005a;
public static final int preferences_front_light_summary=0x7f0a0056;
public static final int preferences_front_light_title=0x7f0a0057;
public static final int preferences_general_title=0x7f0a005b;
public static final int preferences_invert_scan_summary=0x7f0a005d;
public static final int preferences_invert_scan_title=0x7f0a005c;
public static final int preferences_name=0x7f0a005e;
public static final int preferences_play_beep_title=0x7f0a005f;
public static final int preferences_remember_duplicates_summary=0x7f0a0060;
public static final int preferences_remember_duplicates_title=0x7f0a0061;
public static final int preferences_result_title=0x7f0a0062;
public static final int preferences_scanning_title=0x7f0a0063;
public static final int preferences_search_country=0x7f0a0064;
public static final int preferences_supplemental_summary=0x7f0a0067;
public static final int preferences_supplemental_title=0x7f0a0068;
public static final int preferences_try_bsplus=0x7f0a0065;
public static final int preferences_try_bsplus_summary=0x7f0a0066;
public static final int preferences_vibrate_title=0x7f0a0069;
public static final int result_address_book=0x7f0a006a;
public static final int result_calendar=0x7f0a006b;
public static final int result_email_address=0x7f0a006c;
public static final int result_geo=0x7f0a006d;
public static final int result_isbn=0x7f0a006e;
public static final int result_product=0x7f0a006f;
public static final int result_sms=0x7f0a0070;
public static final int result_tel=0x7f0a0071;
public static final int result_text=0x7f0a0072;
public static final int result_uri=0x7f0a0073;
public static final int result_wifi=0x7f0a0074;
public static final int sbc_name=0x7f0a0075;
public static final int wifi_changing_network=0x7f0a0076;
public static final int wifi_ssid_label=0x7f0a0077;
public static final int wifi_type_label=0x7f0a0078;
}
public static final class style {
public static final int CaptureTheme=0x7f0b0002;

5
android/res/values-ar/strings.xml
View file

@ -91,8 +91,11 @@
<string name="preferences_copy_to_clipboard_title">نسخ إلى الحافظة</string>
<string name="preferences_custom_product_search_summary" formatted="false">التبديلات : s٪ = المحتويات ، f٪ = الشكل ، اكتب t٪ =</string>
<string name="preferences_custom_product_search_title">عنوان بحث مخصص</string>
<string name="preferences_decode_1D_title">فك الرموز الشريطية 1D</string>
<string name="preferences_decode_1D_industrial_title">1D الصناعية</string>
<string name="preferences_decode_1D_product_title">1D المنتج</string>
<string name="preferences_decode_Aztec_title">ازتك</string>
<string name="preferences_decode_Data_Matrix_title">فك رموز البيانات ماتريكس</string>
<string name="preferences_decode_PDF417_title">PDF417 (β)</string>
<string name="preferences_decode_QR_title">فك رموز QR</string>
<string name="preferences_device_bug_workarounds_title">الحلول جهاز علة</string>
<string name="preferences_disable_continuous_focus_summary">استخدام وضع معيار التركيز فقط</string>

5
android/res/values-bg/strings.xml
View file

@ -91,8 +91,11 @@
<string name="preferences_copy_to_clipboard_title">Копиране в клипборда</string>
<string name="preferences_custom_product_search_summary" formatted="false">Използвайте: %s за съдържанието,%f за форматa, %t за типа</string>
<string name="preferences_custom_product_search_title">Потребителски адрес за търсене</string>
<string name="preferences_decode_1D_title">1D Баркодове</string>
<string name="preferences_decode_1D_industrial_title">1D Индустриална</string>
<string name="preferences_decode_1D_product_title">1D продукта</string>
<string name="preferences_decode_Aztec_title">Ацтеките</string>
<string name="preferences_decode_Data_Matrix_title">Data Matrix</string>
<string name="preferences_decode_PDF417_title">PDF417 (β)</string>
<string name="preferences_decode_QR_title">QR Баркодове</string>
<string name="preferences_device_bug_workarounds_title">Заобикаляне на проблеми</string>
<string name="preferences_disable_continuous_focus_summary">Използване само на стандартен режим за фокусиране</string>

5
android/res/values-ca/strings.xml
View file

@ -91,8 +91,11 @@
<string name="preferences_copy_to_clipboard_title">Copia al porta-retalls</string>
<string name="preferences_custom_product_search_summary" formatted="false">Substitucions: %s = contingut, %f = format, %t = tipus</string>
<string name="preferences_custom_product_search_title">URL de cerca personalitzat</string>
<string name="preferences_decode_1D_title">Codis de barres 1D</string>
<string name="preferences_decode_1D_industrial_title">1D Industrial</string>
<string name="preferences_decode_1D_product_title">Producte 1D</string>
<string name="preferences_decode_Aztec_title">Aztec</string>
<string name="preferences_decode_Data_Matrix_title">Matriu de dades</string>
<string name="preferences_decode_PDF417_title">PDF417 (β)</string>
<string name="preferences_decode_QR_title">Codis QR</string>
<string name="preferences_device_bug_workarounds_title">Solucions provisionals de dispositius d\'errors</string>
<string name="preferences_disable_continuous_focus_summary">Utilitzeu només la manera d\'enfocament estàndard</string>

5
android/res/values-cs/strings.xml
View file

@ -91,8 +91,11 @@
<string name="preferences_copy_to_clipboard_title">Kopírovat do schránky.</string>
<string name="preferences_custom_product_search_summary" formatted="false">Použijte: %s = obsah, %f = formát, %t = typ</string>
<string name="preferences_custom_product_search_title">Vlastní vyhledávání URL</string>
<string name="preferences_decode_1D_title">1D kódy</string>
<string name="preferences_decode_1D_industrial_title">1D průmyslové</string>
<string name="preferences_decode_1D_product_title">1D produktu</string>
<string name="preferences_decode_Aztec_title">Aztécký</string>
<string name="preferences_decode_Data_Matrix_title">Data Matrix</string>
<string name="preferences_decode_PDF417_title">PDF417 (β)</string>
<string name="preferences_decode_QR_title">QR kódy</string>
<string name="preferences_device_bug_workarounds_title">Možná zástupná řešení chyb zařízení</string>
<string name="preferences_disable_continuous_focus_summary">Používejte pouze standardní zaostřování</string>

5
android/res/values-da/strings.xml
View file

@ -91,8 +91,11 @@
<string name="preferences_copy_to_clipboard_title">Kopiér til udklipsholder</string>
<string name="preferences_custom_product_search_summary" formatted="false">Udskiftninger: %s = indhold, %f = format, %t = type</string>
<string name="preferences_custom_product_search_title">Brugerdefineret søge-URL</string>
<string name="preferences_decode_1D_title">Afkod 1D-stregkoder</string>
<string name="preferences_decode_1D_industrial_title">1D Industriel</string>
<string name="preferences_decode_1D_product_title">1D Produkt</string>
<string name="preferences_decode_Aztec_title">Aztec</string>
<string name="preferences_decode_Data_Matrix_title">Afkod Data Matrix</string>
<string name="preferences_decode_PDF417_title">PDF417 (β)</string>
<string name="preferences_decode_QR_title">Afkod QR-koder</string>
<string name="preferences_device_bug_workarounds_title">Device Bug Løsninger</string>
<string name="preferences_disable_continuous_focus_summary">Brug kun standard fokusindstilling</string>

5
android/res/values-de/strings.xml
View file

@ -91,8 +91,11 @@
<string name="preferences_copy_to_clipboard_title">In die Zwischenablage kopieren</string>
<string name="preferences_custom_product_search_summary" formatted="false">Platzhalter: %s = Inhalt, %f = Format, %t = Typ</string>
<string name="preferences_custom_product_search_title">Eigene Such-URL</string>
<string name="preferences_decode_1D_title">1D Barcodes</string>
<string name="preferences_decode_1D_industrial_title">1D-Industrie</string>
<string name="preferences_decode_1D_product_title">1D-Produkt</string>
<string name="preferences_decode_Aztec_title">Aztec</string>
<string name="preferences_decode_Data_Matrix_title">Data Matrix</string>
<string name="preferences_decode_PDF417_title">PDF417 (β)</string>
<string name="preferences_decode_QR_title">QR Codes</string>
<string name="preferences_device_bug_workarounds_title">Geräteabhängige Problemumgehung</string>
<string name="preferences_disable_continuous_focus_summary">Nur Standard-Fokus-Modus verwenden</string>

5
android/res/values-el/strings.xml
View file

@ -91,8 +91,11 @@
<string name="preferences_copy_to_clipboard_title">Αντιγραφή στο πρόχειρο</string>
<string name="preferences_custom_product_search_summary" formatted="false">Αντικαταστάσεις: %s = περιεχόμενο, %f = μορφή, %t = τύπος</string>
<string name="preferences_custom_product_search_title">Σύνθετη αναζήτηση</string>
<string name="preferences_decode_1D_title">1D barcodes</string>
<string name="preferences_decode_1D_industrial_title">1D Βιομηχανικά</string>
<string name="preferences_decode_1D_product_title">1D Προϊόντος</string>
<string name="preferences_decode_Aztec_title">Αζτέκων</string>
<string name="preferences_decode_Data_Matrix_title">Data Matrix</string>
<string name="preferences_decode_PDF417_title">PDF417 (β)</string>
<string name="preferences_decode_QR_title">QR Codes</string>
<string name="preferences_device_bug_workarounds_title">Λύσεις Bug συσκευής</string>
<string name="preferences_disable_continuous_focus_summary">Χρησιμοποιείτε μόνο τυπική λειτουργία εστίασης</string>

5
android/res/values-es/strings.xml
View file

@ -91,8 +91,11 @@
<string name="preferences_copy_to_clipboard_title">Copiar al portapapeles</string>
<string name="preferences_custom_product_search_summary" formatted="false">Sustituciones: %s = contenido, %f = formato, %t = tipo</string>
<string name="preferences_custom_product_search_title">Búsqueda de productos con URL personalizada</string>
<string name="preferences_decode_1D_title">Códigos de barras 1D</string>
<string name="preferences_decode_1D_industrial_title">1D Industrial</string>
<string name="preferences_decode_1D_product_title">1D Producto</string>
<string name="preferences_decode_Aztec_title">Azteca</string>
<string name="preferences_decode_Data_Matrix_title">Data Matrix</string>
<string name="preferences_decode_PDF417_title">PDF417 (β)</string>
<string name="preferences_decode_QR_title">Códigos QR</string>
<string name="preferences_device_bug_workarounds_title">Soluciones provisionales para dispositivos con errores</string>
<string name="preferences_disable_continuous_focus_summary">Utilice sólo el modo de enfoque estándar</string>

5
android/res/values-eu/strings.xml
View file

@ -91,8 +91,11 @@
<string name="preferences_copy_to_clipboard_title">Kopiatu arbelera</string>
<string name="preferences_custom_product_search_summary" formatted="false">Ordezkapenak: %s = edukiak, %f = formatua, %t = mota</string>
<string name="preferences_custom_product_search_title">Bilaketa URL pertsonalizatua</string>
<string name="preferences_decode_1D_title">1D barra-kodeak</string>
<string name="preferences_decode_1D_industrial_title">1D Industrial</string>
<string name="preferences_decode_1D_product_title">1D Product</string>
<string name="preferences_decode_Aztec_title">Azteken</string>
<string name="preferences_decode_Data_Matrix_title">Datu Matrizeak</string>
<string name="preferences_decode_PDF417_title">PDF417 (β)</string>
<string name="preferences_decode_QR_title">QR Kodeak</string>
<string name="preferences_device_bug_workarounds_title">Gailuak Bug konponbidea</string>
<string name="preferences_disable_continuous_focus_summary">Erabili estandarrean soilik fokuaren modua</string>

5
android/res/values-fi/strings.xml
View file

@ -91,8 +91,11 @@
<string name="preferences_copy_to_clipboard_title">Kopioi leikepöydälle</string>
<string name="preferences_custom_product_search_summary" formatted="false">Seuraavat korvataan: %s = sisältö, %f = formaatti, %t = tyyppi</string>
<string name="preferences_custom_product_search_title">Mukautettu hakukone</string>
<string name="preferences_decode_1D_title">1D-viivakoodit</string>
<string name="preferences_decode_1D_industrial_title">1D Industrial</string>
<string name="preferences_decode_1D_product_title">1D Tuote</string>
<string name="preferences_decode_Aztec_title">Aztec</string>
<string name="preferences_decode_Data_Matrix_title">Data Matrix</string>
<string name="preferences_decode_PDF417_title">PDF417 (β)</string>
<string name="preferences_decode_QR_title">QR-koodit</string>
<string name="preferences_device_bug_workarounds_title">Laitteen vikojen kiertäminen</string>
<string name="preferences_disable_continuous_focus_summary">Käytä vain vakiotarkennusta</string>

5
android/res/values-fr/strings.xml
View file

@ -91,8 +91,11 @@
<string name="preferences_copy_to_clipboard_title">Copier dans le presse-papier</string>
<string name="preferences_custom_product_search_summary" formatted="false">Remplacements : %s = contenu, %f = format, %t = type</string>
<string name="preferences_custom_product_search_title">URL de recherche personnalisée</string>
<string name="preferences_decode_1D_title">Codes-barres 1D</string>
<string name="preferences_decode_1D_industrial_title">1D industrielle</string>
<string name="preferences_decode_1D_product_title">1D produit</string>
<string name="preferences_decode_Aztec_title">Aztec</string>
<string name="preferences_decode_Data_Matrix_title">Data Matrix</string>
<string name="preferences_decode_PDF417_title">PDF417 (β)</string>
<string name="preferences_decode_QR_title">Codes QR</string>
<string name="preferences_device_bug_workarounds_title">Solutions de contournement des bugs de l\'appareil</string>
<string name="preferences_disable_continuous_focus_summary">Utiliser uniquement le mode de mise au point standard</string>

5
android/res/values-he/strings.xml
View file

@ -91,8 +91,11 @@
<string name="preferences_copy_to_clipboard_title">העתק ללוח</string>
<string name="preferences_custom_product_search_summary" formatted="false">החלפות: s% = התוכן, f% = הפורמט, t% = סוג</string>
<string name="preferences_custom_product_search_title">כתובת לחיפוש מותאם אישית</string>
<string name="preferences_decode_1D_title">ברקודים חד מימדיים</string>
<string name="preferences_decode_1D_industrial_title">1D תעשייתי</string>
<string name="preferences_decode_1D_product_title">1D מוצר</string>
<string name="preferences_decode_Aztec_title">האצטקים</string>
<string name="preferences_decode_Data_Matrix_title">מטריצת נתונים</string>
<string name="preferences_decode_PDF417_title">PDF417 (β)</string>
<string name="preferences_decode_QR_title">קודי QR</string>
<string name="preferences_device_bug_workarounds_title">באג במכשיר דרכים לעקיפת הבעיה</string>
<string name="preferences_disable_continuous_focus_summary">השתמש רק במצב רגיל פוקוס</string>

5
android/res/values-hi/strings.xml
View file

@ -91,8 +91,11 @@
<string name="preferences_copy_to_clipboard_title">क्लिपबोर्ड पर कॉपी</string>
<string name="preferences_custom_product_search_summary" formatted="false">स्थानापन्न: %s = सामग्री, %f = प्रारूप, %t = टाइप</string>
<string name="preferences_custom_product_search_title">कस्टम खोज यूआरएल</string>
<string name="preferences_decode_1D_title">1D बारकोड</string>
<string name="preferences_decode_1D_industrial_title">1D औद्योगिक</string>
<string name="preferences_decode_1D_product_title">1D उत्पाद</string>
<string name="preferences_decode_Aztec_title">एज़्टेक</string>
<string name="preferences_decode_Data_Matrix_title">डाटा मैट्रिक्स</string>
<string name="preferences_decode_PDF417_title">PDF417 (β)</string>
<string name="preferences_decode_QR_title">QR कोड</string>
<string name="preferences_device_bug_workarounds_title">युक्ति बग वर्कअराउन्ड</string>
<string name="preferences_disable_continuous_focus_summary">केवल मानक फोकस मोड का उपयोग करें</string>

5
android/res/values-hu/strings.xml
View file

@ -91,8 +91,11 @@
<string name="preferences_copy_to_clipboard_title">Másolás a vágólapra</string>
<string name="preferences_custom_product_search_summary" formatted="false">Használjon: %s = tartalom, %f = formátum, %t = típus</string>
<string name="preferences_custom_product_search_title">Egyedi kereső URL</string>
<string name="preferences_decode_1D_title">1D vonalkódok</string>
<string name="preferences_decode_1D_industrial_title">1D ipari</string>
<string name="preferences_decode_1D_product_title">1D termék</string>
<string name="preferences_decode_Aztec_title">Aztec</string>
<string name="preferences_decode_Data_Matrix_title">Data Matrix</string>
<string name="preferences_decode_PDF417_title">PDF417 (β)</string>
<string name="preferences_decode_QR_title">QR kódok</string>
<string name="preferences_device_bug_workarounds_title">Eszköz Bug Lehetséges megoldások</string>
<string name="preferences_disable_continuous_focus_summary">Csak a normál élességállítási mód</string>

5
android/res/values-id/strings.xml
View file

@ -91,8 +91,11 @@
<string name="preferences_copy_to_clipboard_title">Salin ke clipboard</string>
<string name="preferences_custom_product_search_summary" formatted="false">Substitusi: %s = isi, %f = format, %t = jenis</string>
<string name="preferences_custom_product_search_title">Pencarian URL kustom</string>
<string name="preferences_decode_1D_title">1D barcode</string>
<string name="preferences_decode_1D_industrial_title">1D Industri</string>
<string name="preferences_decode_1D_product_title">1D Produk</string>
<string name="preferences_decode_Aztec_title">Aztec</string>
<string name="preferences_decode_Data_Matrix_title">Data Matriks</string>
<string name="preferences_decode_PDF417_title">PDF417 (β)</string>
<string name="preferences_decode_QR_title">QR Codes</string>
<string name="preferences_device_bug_workarounds_title">Perangkat Bug Workarounds</string>
<string name="preferences_disable_continuous_focus_summary">Gunakan hanya modus fokus standar</string>

7
android/res/values-it/strings.xml
View file

@ -91,8 +91,11 @@
<string name="preferences_copy_to_clipboard_title">Copia negli appunti</string>
<string name="preferences_custom_product_search_summary" formatted="false">Sostituzioni: %s = contenuti, %f = formato, %t = tipo</string>
<string name="preferences_custom_product_search_title">URL ricerca personalizzata</string>
<string name="preferences_decode_1D_title">Codice a barre 1D</string>
<string name="preferences_decode_Data_Matrix_title">Matrice dati</string>
<string name="preferences_decode_1D_industrial_title">1D industriali</string>
<string name="preferences_decode_1D_product_title">1D prodotto</string>
<string name="preferences_decode_Aztec_title">Aztec</string>
<string name="preferences_decode_Data_Matrix_title">Matrice Dati</string>
<string name="preferences_decode_PDF417_title">PDF417 (β)</string>
<string name="preferences_decode_QR_title">Codici QR</string>
<string name="preferences_device_bug_workarounds_title">Soluzioni alternative dispositivo Bug</string>
<string name="preferences_disable_continuous_focus_summary">Utilizzare solo modalità standard messa a fuoco</string>

5
android/res/values-iw/strings.xml
View file

@ -91,8 +91,11 @@
<string name="preferences_copy_to_clipboard_title">העתק ללוח</string>
<string name="preferences_custom_product_search_summary" formatted="false">החלפות: s% = התוכן, f% = הפורמט, t% = סוג</string>
<string name="preferences_custom_product_search_title">כתובת לחיפוש מותאם אישית</string>
<string name="preferences_decode_1D_title">ברקודים חד מימדיים</string>
<string name="preferences_decode_1D_industrial_title">1D תעשייתי</string>
<string name="preferences_decode_1D_product_title">1D מוצר</string>
<string name="preferences_decode_Aztec_title">האצטקים</string>
<string name="preferences_decode_Data_Matrix_title">מטריצת נתונים</string>
<string name="preferences_decode_PDF417_title">PDF417 (β)</string>
<string name="preferences_decode_QR_title">קודי QR</string>
<string name="preferences_device_bug_workarounds_title">באג במכשיר דרכים לעקיפת הבעיה</string>
<string name="preferences_disable_continuous_focus_summary">השתמש רק במצב רגיל פוקוס</string>

5
android/res/values-ja/strings.xml
View file

@ -91,8 +91,11 @@
<string name="preferences_copy_to_clipboard_title">ｸﾘｯﾌﾟﾎﾞｰﾄﾞにｺﾋﾟｰ</string>
<string name="preferences_custom_product_search_summary" formatted="false">引数：％s=コンテンツ、％f=フォーマット、％t=タイプ</string>
<string name="preferences_custom_product_search_title">カスタムサーチ URL</string>
<string name="preferences_decode_1D_title">1次元バーコード</string>
<string name="preferences_decode_1D_industrial_title">1次元バーコード（産業用）</string>
<string name="preferences_decode_1D_product_title">1次元バーコード（商品用）</string>
<string name="preferences_decode_Aztec_title">Aztec Code</string>
<string name="preferences_decode_Data_Matrix_title">データマトリクスコード</string>
<string name="preferences_decode_PDF417_title">PDF417 (β)</string>
<string name="preferences_decode_QR_title">QRコード</string>
<string name="preferences_device_bug_workarounds_title">不具合対策</string>
<string name="preferences_disable_continuous_focus_summary">標準フォーカスモードのみ使用します</string>

5
android/res/values-ko/strings.xml
View file

@ -91,8 +91,11 @@
<string name="preferences_copy_to_clipboard_title">복사하기</string>
<string name="preferences_custom_product_search_summary" formatted="false">자리 표시자: %s = 내용, %f = 포맷, %t = 유형</string>
<string name="preferences_custom_product_search_title">사용자 지정 검색 주소</string>
<string name="preferences_decode_1D_title">1차원 바코드를 읽기</string>
<string name="preferences_decode_1D_industrial_title">1D 산업</string>
<string name="preferences_decode_1D_product_title">1D 제품</string>
<string name="preferences_decode_Aztec_title">아즈텍</string>
<string name="preferences_decode_Data_Matrix_title">데이터 행렬(Data Matrix)을 해석하기</string>
<string name="preferences_decode_PDF417_title">PDF417 (β)</string>
<string name="preferences_decode_QR_title">QR 코드를 읽기</string>
<string name="preferences_device_bug_workarounds_title">장치 버그 해결</string>
<string name="preferences_disable_continuous_focus_summary">전용 표준 초점 모드를 사용</string>

7
android/res/values-nl/strings.xml
View file

@ -91,9 +91,12 @@
<string name="preferences_copy_to_clipboard_title">Kopiëren naar klembord</string>
<string name="preferences_custom_product_search_summary" formatted="false">Vervanginen: %s = inhoud, %f = formaat, %t = type</string>
<string name="preferences_custom_product_search_title">Aangepaste zoek-URL</string>
<string name="preferences_decode_1D_title">1D-barcodes</string>
<string name="preferences_decode_1D_industrial_title">1D industrieel</string>
<string name="preferences_decode_1D_product_title">1D product</string>
<string name="preferences_decode_Aztec_title">Aztec</string>
<string name="preferences_decode_Data_Matrix_title">Datamatrix</string>
<string name="preferences_decode_QR_title">QR-codes</string>
<string name="preferences_decode_PDF417_title">PDF417 (β)</string>
<string name="preferences_decode_QR_title">QR Codes</string>
<string name="preferences_device_bug_workarounds_title">Apparaat Bug Tijdelijke oplossingen</string>
<string name="preferences_disable_continuous_focus_summary">Gebruik alleen standaard focus modus</string>
<string name="preferences_disable_continuous_focus_title">Geen continue focus</string>

5
android/res/values-pl/strings.xml
View file

@ -91,8 +91,11 @@
<string name="preferences_copy_to_clipboard_title">Kopiuj do schowka</string>
<string name="preferences_custom_product_search_summary" formatted="false">Zastępstwa: %s = zawartość, %f = format, %t = typ</string>
<string name="preferences_custom_product_search_title">Własny URL wyszukiwania</string>
<string name="preferences_decode_1D_title">Dekoduj kody 1D</string>
<string name="preferences_decode_1D_industrial_title">1D przemysłowe</string>
<string name="preferences_decode_1D_product_title">1D wyrobów</string>
<string name="preferences_decode_Aztec_title">Aztek</string>
<string name="preferences_decode_Data_Matrix_title">Dekoduj Decode Matrix</string>
<string name="preferences_decode_PDF417_title">PDF417 (β)</string>
<string name="preferences_decode_QR_title">Dekoduj kody QR</string>
<string name="preferences_device_bug_workarounds_title">Obejścia błędów urządzeń</string>
<string name="preferences_disable_continuous_focus_summary">Używaj tylko standardowego trybu ostrości</string>

5
android/res/values-pt/strings.xml
View file

@ -91,8 +91,11 @@
<string name="preferences_copy_to_clipboard_title">Copiar para a área de transferência</string>
<string name="preferences_custom_product_search_summary" formatted="false">Substituições: %s = conteúdos, %f = formato, %t = tipo</string>
<string name="preferences_custom_product_search_title">Pesquisa personalizada de URL</string>
<string name="preferences_decode_1D_title">Código de barras 1D</string>
<string name="preferences_decode_1D_industrial_title">Indústrial 1D</string>
<string name="preferences_decode_1D_product_title">Produto 1D</string>
<string name="preferences_decode_Aztec_title">Aztec</string>
<string name="preferences_decode_Data_Matrix_title">Data Matrix</string>
<string name="preferences_decode_PDF417_title">PDF417 (β)</string>
<string name="preferences_decode_QR_title">QR Codes</string>
<string name="preferences_device_bug_workarounds_title">Soluções alternativas de dispositivos com erros</string>
<string name="preferences_disable_continuous_focus_summary">Use apenas o modo de focagem padrão</string>

7
android/res/values-ro/strings.xml
View file

@ -91,8 +91,11 @@
<string name="preferences_copy_to_clipboard_title">Copiază în clipboard</string>
<string name="preferences_custom_product_search_summary" formatted="false">Înlocuiri: %s = conținut, %f = format, %t = tip</string>
<string name="preferences_custom_product_search_title">Căutare URL personalizată</string>
<string name="preferences_decode_1D_title">Coduri de bară 1D</string>
<string name="preferences_decode_Data_Matrix_title">Coduri Data Matrix</string>
<string name="preferences_decode_1D_industrial_title">1D Industriale</string>
<string name="preferences_decode_1D_product_title">1D Produs</string>
<string name="preferences_decode_Aztec_title">Aztec</string>
<string name="preferences_decode_Data_Matrix_title">Data Matrix</string>
<string name="preferences_decode_PDF417_title">PDF417</string>
<string name="preferences_decode_QR_title">Coduri QR</string>
<string name="preferences_device_bug_workarounds_title">Rezolvări rapide ale defectelor la aparat</string>
<string name="preferences_disable_continuous_focus_summary">Folosește focalizarea standard</string>

7
android/res/values-ru/strings.xml
View file

@ -91,8 +91,11 @@
<string name="preferences_copy_to_clipboard_title">Копировать в буфер обмена</string>
<string name="preferences_custom_product_search_summary" formatted="false">Замены: %s = содержание, %f = формат, %t = тип</string>
<string name="preferences_custom_product_search_title">URL пользовательского поиска</string>
<string name="preferences_decode_1D_title">Распознавать линейные штрих-коды</string>
<string name="preferences_decode_Data_Matrix_title">Распознавать Data Matrix</string>
<string name="preferences_decode_1D_industrial_title">1D Промышленное</string>
<string name="preferences_decode_1D_product_title">1D товара</string>
<string name="preferences_decode_Aztec_title">Ацтекский</string>
<string name="preferences_decode_Data_Matrix_title">Data Matrix</string>
<string name="preferences_decode_PDF417_title">PDF417 (β)</string>
<string name="preferences_decode_QR_title">Распознавать QR-коды</string>
<string name="preferences_device_bug_workarounds_title">Исправление ошибок устройства</string>
<string name="preferences_disable_continuous_focus_summary">Стандартный режим фокусировки</string>

5
android/res/values-sk/strings.xml
View file

@ -91,8 +91,11 @@
<string name="preferences_copy_to_clipboard_title">Kopírovať do schránky</string>
<string name="preferences_custom_product_search_summary" formatted="false">Nahradiť: %s = obsah, %f = formát, %t = typ</string>
<string name="preferences_custom_product_search_title">Vlastné vyhľadávanie URL</string>
<string name="preferences_decode_1D_title">1D čiarové kódy</string>
<string name="preferences_decode_1D_industrial_title">1D priemyselné</string>
<string name="preferences_decode_1D_product_title">1D tovar</string>
<string name="preferences_decode_Aztec_title">Aztécky</string>
<string name="preferences_decode_Data_Matrix_title">Dáta Matrix</string>
<string name="preferences_decode_PDF417_title">PDF417 (β)</string>
<string name="preferences_decode_QR_title">QR kódy</string>
<string name="preferences_device_bug_workarounds_title">Možné chyby zariadenia</string>
<string name="preferences_disable_continuous_focus_summary">Použiť iba štandardné zaostrenie</string>

5
android/res/values-sl/strings.xml
View file

@ -91,8 +91,11 @@
<string name="preferences_copy_to_clipboard_title">Kopiraj v beležnico</string>
<string name="preferences_custom_product_search_summary" formatted="false">Zamenjave: %s = vsebin, %f = format, %t = vrsta</string>
<string name="preferences_custom_product_search_title">URL za iskanje po meri</string>
<string name="preferences_decode_1D_title">1D črtno kodo</string>
<string name="preferences_decode_1D_industrial_title">1D industrial</string>
<string name="preferences_decode_1D_product_title">1D izdelka</string>
<string name="preferences_decode_Aztec_title">Aztec</string>
<string name="preferences_decode_Data_Matrix_title">Data Matrix</string>
<string name="preferences_decode_PDF417_title">PDF417 (β)</string>
<string name="preferences_decode_QR_title">QR kodo</string>
<string name="preferences_device_bug_workarounds_title">Naprava Bug Rešitve</string>
<string name="preferences_disable_continuous_focus_summary">Uporabljajte samo standardni način ostrenja</string>

5
android/res/values-sv/strings.xml
View file

@ -91,8 +91,11 @@
<string name="preferences_copy_to_clipboard_title">Kopiera till urklipp</string>
<string name="preferences_custom_product_search_summary" formatted="false">Ersättningar: %s = innehåll, %f = format, %t = typ</string>
<string name="preferences_custom_product_search_title">Anpassad sökning URL</string>
<string name="preferences_decode_1D_title">1D steckkod</string>
<string name="preferences_decode_1D_industrial_title">1D Industriell</string>
<string name="preferences_decode_1D_product_title">1D Produkt</string>
<string name="preferences_decode_Aztec_title">Aztec</string>
<string name="preferences_decode_Data_Matrix_title">Data Matrix</string>
<string name="preferences_decode_PDF417_title">PDF417 (β)</string>
<string name="preferences_decode_QR_title">QR Code</string>
<string name="preferences_device_bug_workarounds_title">Bugglösningar för enhet</string>
<string name="preferences_disable_continuous_focus_summary">Använd endast standardfokusläge</string>

5
android/res/values-tr/strings.xml
View file

@ -91,8 +91,11 @@
<string name="preferences_copy_to_clipboard_title">Panoya kopyala</string>
<string name="preferences_custom_product_search_summary" formatted="false">Yerine Koyma: %s = içeriği, %f = biçim, %t = tip</string>
<string name="preferences_custom_product_search_title">Özel arama adresi</string>
<string name="preferences_decode_1D_title">1D barkodları</string>
<string name="preferences_decode_1D_industrial_title">1D Sanayi</string>
<string name="preferences_decode_1D_product_title">1D Ürün</string>
<string name="preferences_decode_Aztec_title">Aztek</string>
<string name="preferences_decode_Data_Matrix_title">Data Matrix</string>
<string name="preferences_decode_PDF417_title">PDF417 (β)</string>
<string name="preferences_decode_QR_title">QR barkodları</string>
<string name="preferences_device_bug_workarounds_title">Cihaz Hata Geçici Çözümler</string>
<string name="preferences_disable_continuous_focus_summary">Sadece standart odaklama modunu kullanın</string>

5
android/res/values-uk/strings.xml
View file

@ -91,8 +91,11 @@
<string name="preferences_copy_to_clipboard_title">Скопіювати до буферу обміну</string>
<string name="preferences_custom_product_search_summary" formatted="false">Заміни: %s = вміст, %f = формат, %t = тип</string>
<string name="preferences_custom_product_search_title">URL користувацького пошуку</string>
<string name="preferences_decode_1D_title">Розпізнавати лінійні штрих-коди</string>
<string name="preferences_decode_1D_industrial_title">Промислові 1D</string>
<string name="preferences_decode_1D_product_title">1D продукту</string>
<string name="preferences_decode_Aztec_title">Ацтекскій</string>
<string name="preferences_decode_Data_Matrix_title">Розпізнавати Data Matrix</string>
<string name="preferences_decode_PDF417_title">PDF417 (β)</string>
<string name="preferences_decode_QR_title">Розпізнавати QR-коди</string>
<string name="preferences_device_bug_workarounds_title">Виправлення помилок пристрою</string>
<string name="preferences_disable_continuous_focus_summary">Стандартний режим фокусування</string>

5
android/res/values-zh-rCN/strings.xml
View file

@ -91,8 +91,11 @@
<string name="preferences_copy_to_clipboard_title">复制到剪切板</string>
<string name="preferences_custom_product_search_summary" formatted="false">替换：％s=内容，％f=格式，％t=类型</string>
<string name="preferences_custom_product_search_title">自定义搜索网址</string>
<string name="preferences_decode_1D_title">扫描 一维条码</string>
<string name="preferences_decode_1D_industrial_title">1D工业</string>
<string name="preferences_decode_1D_product_title">1D产品</string>
<string name="preferences_decode_Aztec_title">阿兹台克人</string>
<string name="preferences_decode_Data_Matrix_title">扫描 DM码</string>
<string name="preferences_decode_PDF417_title">PDF417 (β)</string>
<string name="preferences_decode_QR_title">扫描 QR码</string>
<string name="preferences_device_bug_workarounds_title">设备问题解决办法</string>
<string name="preferences_disable_continuous_focus_summary">只使用标准对焦模式</string>

5
android/res/values-zh-rTW/strings.xml
View file

@ -91,8 +91,11 @@
<string name="preferences_copy_to_clipboard_title">複製到剪貼簿</string>
<string name="preferences_custom_product_search_summary" formatted="false">替換：％s=內容，％f=格式，％t=類型</string>
<string name="preferences_custom_product_search_title">自訂搜尋網址</string>
<string name="preferences_decode_1D_title">解碼一維條碼</string>
<string name="preferences_decode_1D_industrial_title">1D工業</string>
<string name="preferences_decode_1D_product_title">1D產品</string>
<string name="preferences_decode_Aztec_title">阿茲台克</string>
<string name="preferences_decode_Data_Matrix_title">解碼 Data Matrix 條碼</string>
<string name="preferences_decode_PDF417_title">PDF417</string>
<string name="preferences_decode_QR_title">解碼 QR Code</string>
<string name="preferences_device_bug_workarounds_title">設備問題解決辦法</string>
<string name="preferences_disable_continuous_focus_summary">只使用標準對焦模式</string>

5
android/res/values/strings.xml
View file

@ -91,8 +91,11 @@
<string name="preferences_copy_to_clipboard_title">Copy to clipboard</string>
<string name="preferences_custom_product_search_summary" formatted="false">Substitutions: %s = contents, %f = format, %t = type</string>
<string name="preferences_custom_product_search_title">Custom search URL</string>
<string name="preferences_decode_1D_title">1D barcodes</string>
<string name="preferences_decode_1D_industrial_title">1D Industrial</string>
<string name="preferences_decode_1D_product_title">1D Product</string>
<string name="preferences_decode_Aztec_title">Aztec</string>
<string name="preferences_decode_Data_Matrix_title">Data Matrix</string>
<string name="preferences_decode_PDF417_title">PDF417 (β)</string>
<string name="preferences_decode_QR_title">QR Codes</string>
<string name="preferences_device_bug_workarounds_title">Device Bug Workarounds</string>
<string name="preferences_disable_continuous_focus_summary">Use only standard focus mode</string>

16
android/res/xml/preferences.xml
View file

@ -17,9 +17,13 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory android:title="@string/preferences_scanning_title">
<CheckBoxPreference
android:key="preferences_decode_1D"
android:key="preferences_decode_1D_product"
android:defaultValue="true"
android:title="@string/preferences_decode_1D_title"/>
android:title="@string/preferences_decode_1D_product_title"/>
<CheckBoxPreference
android:key="preferences_decode_1D_industrial"
android:defaultValue="true"
android:title="@string/preferences_decode_1D_industrial_title"/>
<CheckBoxPreference
android:key="preferences_decode_QR"
android:defaultValue="true"
@ -28,6 +32,14 @@
android:key="preferences_decode_Data_Matrix"
android:defaultValue="true"
android:title="@string/preferences_decode_Data_Matrix_title"/>
<CheckBoxPreference
android:key="preferences_decode_Aztec"
android:defaultValue="false"
android:title="@string/preferences_decode_Aztec_title"/>
<CheckBoxPreference
android:key="preferences_decode_PDF417"
android:defaultValue="false"
android:title="@string/preferences_decode_PDF417_title"/>
</PreferenceCategory>
<PreferenceCategory android:title="@string/preferences_actions_title">
<CheckBoxPreference

70
android/src/com/google/zxing/client/android/DecodeFormatManager.java
View file

@ -16,24 +16,29 @@
package com.google.zxing.client.android;
import java.util.Arrays;
import java.util.Collection;
import java.util.EnumSet;
import java.util.List;
import java.util.regex.Pattern;
import android.content.Intent;
import android.net.Uri;
import com.google.zxing.BarcodeFormat;
import java.util.Arrays;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.regex.Pattern;
final class DecodeFormatManager {
private static final Pattern COMMA_PATTERN = Pattern.compile(",");
static final Collection<BarcodeFormat> PRODUCT_FORMATS;
static final Collection<BarcodeFormat> ONE_D_FORMATS;
static final Collection<BarcodeFormat> QR_CODE_FORMATS = EnumSet.of(BarcodeFormat.QR_CODE);
static final Collection<BarcodeFormat> DATA_MATRIX_FORMATS = EnumSet.of(BarcodeFormat.DATA_MATRIX);
static final Set<BarcodeFormat> PRODUCT_FORMATS;
static final Set<BarcodeFormat> INDUSTRIAL_FORMATS;
private static final Set<BarcodeFormat> ONE_D_FORMATS;
static final Set<BarcodeFormat> QR_CODE_FORMATS = EnumSet.of(BarcodeFormat.QR_CODE);
static final Set<BarcodeFormat> DATA_MATRIX_FORMATS = EnumSet.of(BarcodeFormat.DATA_MATRIX);
static final Set<BarcodeFormat> AZTEC_FORMATS = EnumSet.of(BarcodeFormat.AZTEC);
static final Set<BarcodeFormat> PDF417_FORMATS = EnumSet.of(BarcodeFormat.PDF_417);
static {
PRODUCT_FORMATS = EnumSet.of(BarcodeFormat.UPC_A,
BarcodeFormat.UPC_E,
@ -41,17 +46,28 @@ final class DecodeFormatManager {
BarcodeFormat.EAN_8,
BarcodeFormat.RSS_14,
BarcodeFormat.RSS_EXPANDED);
ONE_D_FORMATS = EnumSet.of(BarcodeFormat.CODE_39,
BarcodeFormat.CODE_93,
BarcodeFormat.CODE_128,
BarcodeFormat.ITF,
BarcodeFormat.CODABAR);
ONE_D_FORMATS.addAll(PRODUCT_FORMATS);
INDUSTRIAL_FORMATS = EnumSet.of(BarcodeFormat.CODE_39,
BarcodeFormat.CODE_93,
BarcodeFormat.CODE_128,
BarcodeFormat.ITF,
BarcodeFormat.CODABAR);
ONE_D_FORMATS = EnumSet.copyOf(PRODUCT_FORMATS);
ONE_D_FORMATS.addAll(INDUSTRIAL_FORMATS);
}
private static final Map<String,Set<BarcodeFormat>> FORMATS_FOR_MODE;
static {
FORMATS_FOR_MODE = new HashMap<>();
FORMATS_FOR_MODE.put(Intents.Scan.ONE_D_MODE, ONE_D_FORMATS);
FORMATS_FOR_MODE.put(Intents.Scan.PRODUCT_MODE, PRODUCT_FORMATS);
FORMATS_FOR_MODE.put(Intents.Scan.QR_CODE_MODE, QR_CODE_FORMATS);
FORMATS_FOR_MODE.put(Intents.Scan.DATA_MATRIX_MODE, DATA_MATRIX_FORMATS);
FORMATS_FOR_MODE.put(Intents.Scan.AZTEC_MODE, AZTEC_FORMATS);
FORMATS_FOR_MODE.put(Intents.Scan.PDF417_MODE, PDF417_FORMATS);
}
private DecodeFormatManager() {}
static Collection<BarcodeFormat> parseDecodeFormats(Intent intent) {
static Set<BarcodeFormat> parseDecodeFormats(Intent intent) {
Iterable<String> scanFormats = null;
CharSequence scanFormatsString = intent.getStringExtra(Intents.Scan.FORMATS);
if (scanFormatsString != null) {
@ -60,7 +76,7 @@ final class DecodeFormatManager {
return parseDecodeFormats(scanFormats, intent.getStringExtra(Intents.Scan.MODE));
}
static Collection<BarcodeFormat> parseDecodeFormats(Uri inputUri) {
static Set<BarcodeFormat> parseDecodeFormats(Uri inputUri) {
List<String> formats = inputUri.getQueryParameters(Intents.Scan.FORMATS);
if (formats != null && formats.size() == 1 && formats.get(0) != null){
formats = Arrays.asList(COMMA_PATTERN.split(formats.get(0)));
@ -68,10 +84,9 @@ final class DecodeFormatManager {
return parseDecodeFormats(formats, inputUri.getQueryParameter(Intents.Scan.MODE));
}
private static Collection<BarcodeFormat> parseDecodeFormats(Iterable<String> scanFormats,
String decodeMode) {
private static Set<BarcodeFormat> parseDecodeFormats(Iterable<String> scanFormats, String decodeMode) {
if (scanFormats != null) {
Collection<BarcodeFormat> formats = EnumSet.noneOf(BarcodeFormat.class);
Set<BarcodeFormat> formats = EnumSet.noneOf(BarcodeFormat.class);
try {
for (String format : scanFormats) {
formats.add(BarcodeFormat.valueOf(format));
@ -82,18 +97,7 @@ final class DecodeFormatManager {
}
}
if (decodeMode != null) {
if (Intents.Scan.PRODUCT_MODE.equals(decodeMode)) {
return PRODUCT_FORMATS;
}
if (Intents.Scan.QR_CODE_MODE.equals(decodeMode)) {
return QR_CODE_FORMATS;
}
if (Intents.Scan.DATA_MATRIX_MODE.equals(decodeMode)) {
return DATA_MATRIX_FORMATS;
}
if (Intents.Scan.ONE_D_MODE.equals(decodeMode)) {
return ONE_D_FORMATS;
}
return FORMATS_FOR_MODE.get(decodeMode);
}
return null;
}

13
android/src/com/google/zxing/client/android/DecodeThread.java
View file

@ -65,8 +65,11 @@ final class DecodeThread extends Thread {
if (decodeFormats == null || decodeFormats.isEmpty()) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(activity);
decodeFormats = EnumSet.noneOf(BarcodeFormat.class);
if (prefs.getBoolean(PreferencesActivity.KEY_DECODE_1D, false)) {
decodeFormats.addAll(DecodeFormatManager.ONE_D_FORMATS);
if (prefs.getBoolean(PreferencesActivity.KEY_DECODE_1D_PRODUCT, false)) {
decodeFormats.addAll(DecodeFormatManager.PRODUCT_FORMATS);
}
if (prefs.getBoolean(PreferencesActivity.KEY_DECODE_1D_INDUSTRIAL, false)) {
decodeFormats.addAll(DecodeFormatManager.INDUSTRIAL_FORMATS);
}
if (prefs.getBoolean(PreferencesActivity.KEY_DECODE_QR, false)) {
decodeFormats.addAll(DecodeFormatManager.QR_CODE_FORMATS);
@ -74,6 +77,12 @@ final class DecodeThread extends Thread {
if (prefs.getBoolean(PreferencesActivity.KEY_DECODE_DATA_MATRIX, false)) {
decodeFormats.addAll(DecodeFormatManager.DATA_MATRIX_FORMATS);
}
if (prefs.getBoolean(PreferencesActivity.KEY_DECODE_AZTEC, false)) {
decodeFormats.addAll(DecodeFormatManager.AZTEC_FORMATS);
}
if (prefs.getBoolean(PreferencesActivity.KEY_DECODE_PDF417, false)) {
decodeFormats.addAll(DecodeFormatManager.PDF417_FORMATS);
}
}
hints.put(DecodeHintType.POSSIBLE_FORMATS, decodeFormats);

10
android/src/com/google/zxing/client/android/Intents.java
View file

@ -64,6 +64,16 @@ public final class Intents {
*/
public static final String DATA_MATRIX_MODE = "DATA_MATRIX_MODE";
/**
* Decode only Aztec.
*/
public static final String AZTEC_MODE = "AZTEC_MODE";
/**
* Decode only PDF417.
*/
public static final String PDF417_MODE = "PDF417_MODE";
/**
* Comma-separated list of formats to scan for. The values must match the names of
* {@link com.google.zxing.BarcodeFormat}s, e.g. {@link com.google.zxing.BarcodeFormat#EAN_13}.

6
android/src/com/google/zxing/client/android/PreferencesActivity.java
View file

@ -27,9 +27,13 @@ import android.os.Bundle;
*/
public final class PreferencesActivity extends Activity {
public static final String KEY_DECODE_1D = "preferences_decode_1D";
public static final String KEY_DECODE_1D_PRODUCT = "preferences_decode_1D_product";
public static final String KEY_DECODE_1D_INDUSTRIAL = "preferences_decode_1D_industrial";
public static final String KEY_DECODE_QR = "preferences_decode_QR";
public static final String KEY_DECODE_DATA_MATRIX = "preferences_decode_Data_Matrix";
public static final String KEY_DECODE_AZTEC = "preferences_decode_Aztec";
public static final String KEY_DECODE_PDF417 = "preferences_decode_PDF417";
public static final String KEY_CUSTOM_PRODUCT_SEARCH = "preferences_custom_product_search";
public static final String KEY_PLAY_BEEP = "preferences_play_beep";

44
android/src/com/google/zxing/client/android/PreferencesFragment.java
View file

@ -28,10 +28,8 @@ import android.preference.PreferenceScreen;
public final class PreferencesFragment
extends PreferenceFragment
implements SharedPreferences.OnSharedPreferenceChangeListener {
private CheckBoxPreference decode1D;
private CheckBoxPreference decodeQR;
private CheckBoxPreference decodeDataMatrix;
private CheckBoxPreference[] checkBoxPrefs;
@Override
public void onCreate(Bundle icicle) {
@ -40,11 +38,23 @@ public final class PreferencesFragment
PreferenceScreen preferences = getPreferenceScreen();
preferences.getSharedPreferences().registerOnSharedPreferenceChangeListener(this);
decode1D = (CheckBoxPreference) preferences.findPreference(PreferencesActivity.KEY_DECODE_1D);
decodeQR = (CheckBoxPreference) preferences.findPreference(PreferencesActivity.KEY_DECODE_QR);
decodeDataMatrix = (CheckBoxPreference) preferences.findPreference(PreferencesActivity.KEY_DECODE_DATA_MATRIX);
checkBoxPrefs = findDecodePrefs(preferences,
PreferencesActivity.KEY_DECODE_1D_PRODUCT,
PreferencesActivity.KEY_DECODE_1D_INDUSTRIAL,
PreferencesActivity.KEY_DECODE_QR,
PreferencesActivity.KEY_DECODE_DATA_MATRIX,
PreferencesActivity.KEY_DECODE_AZTEC,
PreferencesActivity.KEY_DECODE_PDF417);
disableLastCheckedPref();
}
private static CheckBoxPreference[] findDecodePrefs(PreferenceScreen preferences, String... keys) {
CheckBoxPreference[] prefs = new CheckBoxPreference[keys.length];
for (int i = 0; i < keys.length; i++) {
prefs[i] = (CheckBoxPreference) preferences.findPreference(keys[i]);
}
return prefs;
}
@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
@ -52,20 +62,16 @@ public final class PreferencesFragment
}
private void disableLastCheckedPref() {
Collection<CheckBoxPreference> checked = new ArrayList<>(3);
if (decode1D.isChecked()) {
checked.add(decode1D);
Collection<CheckBoxPreference> checked = new ArrayList<>(checkBoxPrefs.length);
for (CheckBoxPreference pref : checkBoxPrefs) {
if (pref.isChecked()) {
checked.add(pref);
}
}
if (decodeQR.isChecked()) {
checked.add(decodeQR);
}
if (decodeDataMatrix.isChecked()) {
checked.add(decodeDataMatrix);
}
boolean disable = checked.size() < 2;
CheckBoxPreference[] checkBoxPreferences = {decode1D, decodeQR, decodeDataMatrix};
for (CheckBoxPreference pref : checkBoxPreferences) {
boolean disable = checked.size() <= 1;
for (CheckBoxPreference pref : checkBoxPrefs) {
pref.setEnabled(!(disable && checked.contains(pref)));
}
}
}