Changes for compatibility with SDK 9 / Android 2.3

git-svn-id: https://zxing.googlecode.com/svn/trunk@1688 59b500cc-1b3d-0410-9834-0bbf25fbcc57

android/build.xml

@@ -86,6 +86,7 @@ limitations under the License.
   <!-- Properties -->
 
   <property name="android-tools" value="${sdk.dir}/tools" />
+  <property name="platform-tools" value="${sdk.dir}/platform-tools" />
 
   <!-- Input directories -->
   <property name="source-folder" value="src" />
@@ -123,7 +124,7 @@ limitations under the License.
 
   <!-- Tools -->
   <condition property="exe" value=".exe" else=""><os family="windows"/></condition>
-  <property name="adb" value="${android-tools}/adb${exe}"/>
+  <property name="adb" value="${platform-tools}/adb${exe}"/>
 
   <!-- rules -->
 
@@ -235,11 +236,12 @@ limitations under the License.
     <aaptexec executable="${aapt}"
               command="package"
               manifest="AndroidManifest.xml"
-              resources="${resource-folder}"
               assets="${asset-folder}"
               androidjar="${android.jar}"
-              outfolder="${out-folder}"
-              basename="${ant.project.name}" />
+              apkfolder="${out-folder}"
+              resourcefilename="${ant.project.name}">
+      <res path="${resource-folder}"/>
+    </aaptexec>
   </target>
 
   <!--
@@ -260,10 +262,10 @@ limitations under the License.
   <target name="debug" depends="dex, package-resources">
     <apkbuilder
         outfolder="${out-folder}"
-        resourcefile="BarcodeScanner.ap_"
+        resourcefile="BarcodeScanner"
         apkfilepath="${out-folder}/BarcodeScanner-debug.apk"
-        debug="true"
-        signed="true"
+        debugpackaging="true"
+        debugsigning="true"
         verbose="false">
       <dex path="${intermediate-dex-location}" />
       <sourcefolder path="${source-folder}" />
@@ -284,10 +286,10 @@ limitations under the License.
   <target name="release" depends="dex, package-resources">
     <apkbuilder
         outfolder="${out-folder}"
-        resourcefile="BarcodeScanner.ap_"
+        resourcefile="BarcodeScanner_"
         apkfilepath="${out-folder}/BarcodeScanner-unsigned.apk"
-        debug="false"
-        signed="false"
+        debugpackaging="false"
+        debugsigning="false"
         verbose="false">
       <dex path="${intermediate-dex-location}" />
       <sourcefolder path="${source-folder}" />

android/default.properties

@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-8
+target=android-9

android/res/values-ar/strings.xml

@@ -94,7 +94,7 @@
   <string name="preferences_bulk_mode_summary">المسح الضوئي وحفظها بشكل مستمر العديد من الرموز الشريطية</string>
   <string name="preferences_bulk_mode_title">جل وضع المسح الضوئي</string>
   <string name="preferences_copy_to_clipboard_title">نسخ إلى الحافظة</string>
-  <string name="preferences_custom_product_search_summary">استخدم %s كعنصر نائب لمعرف المنتج</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">استخدم %s كعنصر نائب لمعرف المنتج</string>
   <string name="preferences_custom_product_search_title">عنوان بحث مخصص</string>
   <string name="preferences_decode_1D_title">فك الرموز الشريطية 1D</string>
   <string name="preferences_decode_Data_Matrix_title">فك رموز البيانات ماتريكس</string>

android/res/values-cs/strings.xml

@@ -94,7 +94,7 @@
   <string name="preferences_bulk_mode_summary">Skenování více čárových kódú bez přerušení, vhodné na dávkové zpracování velkého množství čárových kódú</string>
   <string name="preferences_bulk_mode_title">Dávkový režim skenování</string>
   <string name="preferences_copy_to_clipboard_title">Kopírovat do schránky.</string>
-  <string name="preferences_custom_product_search_summary">Použijte %s jako zástupný symbol pro ID produktu, a %f pro formát</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">Použijte %s jako zástupný symbol pro ID produktu, a %f pro formát</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_Data_Matrix_title">Data Matrix</string>

android/res/values-da/strings.xml

@@ -94,7 +94,7 @@
   <string name="preferences_bulk_mode_summary">Scan og gem mange stregkoder uden afbrydelser</string>
   <string name="preferences_bulk_mode_title">Massescanningstilstand</string>
   <string name="preferences_copy_to_clipboard_title">Kopiér til udklipsholder</string>
-  <string name="preferences_custom_product_search_summary">Brug %s som en pladsholder for produkt-id, og %f for format</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">Brug %s som en pladsholder for produkt-id, og %f for format</string>
   <string name="preferences_custom_product_search_title">Brugerdefineret søge-URL</string>
   <string name="preferences_decode_1D_title">Oversæt 1D stregkoder</string>
   <string name="preferences_decode_Data_Matrix_title">Oversæt Data Matrix</string>

android/res/values-de/strings.xml

@@ -94,7 +94,7 @@
   <string name="preferences_bulk_mode_summary">Scannt und speichert mehrere Barcodes nacheinander</string>
   <string name="preferences_bulk_mode_title">Bulk-Scan-Modus</string>
   <string name="preferences_copy_to_clipboard_title">In Zwischenablage kopieren</string>
-  <string name="preferences_custom_product_search_summary">Verwenden Sie %s als Platzhalter für die Produkt-ID und %f für das Format</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">Verwenden Sie %s als Platzhalter für die Produkt-ID und %f für das Format</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_Data_Matrix_title">Data Matrix</string>

android/res/values-es/strings.xml

@@ -94,7 +94,7 @@
   <string name="preferences_bulk_mode_summary">Escanear y guardar muchos códigos de barras de forma continua</string>
   <string name="preferences_bulk_mode_title">Bulk modo de exploración</string>
   <string name="preferences_copy_to_clipboard_title">Copiar al portapapeles</string>
-  <string name="preferences_custom_product_search_summary">Use %s como un marcador de posición para el identificador del producto, y %f para el formato</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">Use %s como un marcador de posición para el identificador del producto, y %f para el formato</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_Data_Matrix_title">Data Matrix</string>

android/res/values-fi/strings.xml

@@ -94,7 +94,7 @@
   <string name="preferences_bulk_mode_summary">Skannaa ja tallenna monet viivakoodeja jatkuvasti</string>
   <string name="preferences_bulk_mode_title">Bulk skannaustilassa</string>
   <string name="preferences_copy_to_clipboard_title">Kopioi leikepöydälle</string>
-  <string name="preferences_custom_product_search_summary">Käytä %s paikkana tuotetunnukselle tunnus ja %f muoto</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">Käytä %s paikkana tuotetunnukselle tunnus ja %f muoto</string>
   <string name="preferences_custom_product_search_title">Mukautettu hakukone</string>
   <string name="preferences_decode_1D_title">1D viivakoodeja</string>
   <string name="preferences_decode_Data_Matrix_title">Data Matrix</string>

android/res/values-fr/strings.xml

@@ -94,7 +94,7 @@
   <string name="preferences_bulk_mode_summary">Scanner et enregistrer plusieurs codes-barres d\'affilée</string>
   <string name="preferences_bulk_mode_title">Mode de lecture en rafale</string>
   <string name="preferences_copy_to_clipboard_title">Copier dans le presse papier</string>
-  <string name="preferences_custom_product_search_summary">Utiliser %s à la place de l\'identifiant du produit, et %f pour le format</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">Utiliser %s à la place de l\'identifiant du produit, et %f pour le format</string>
   <string name="preferences_custom_product_search_title">URL de recherche personnalisée</string>
   <string name="preferences_decode_1D_title">Unidimensionnels (1D)</string>
   <string name="preferences_decode_Data_Matrix_title">Data Matrix</string>

android/res/values-hu/strings.xml

@@ -94,7 +94,7 @@
   <string name="preferences_bulk_mode_summary">Beolvasni és elmenteni több vonalkód folyamatosan</string>
   <string name="preferences_bulk_mode_title">Tömeges scan üzemmód</string>
   <string name="preferences_copy_to_clipboard_title">Másolás a vágólapra</string>
-  <string name="preferences_custom_product_search_summary">Használja a %s helyktöltést a termék azonosító helyén, és %f esetében formátum</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">Használja a %s helyktöltést a termék azonosító helyén, és %f esetében formátum</string>
   <string name="preferences_custom_product_search_title">Egyedi keresés URL</string>
   <string name="preferences_decode_1D_title">1D vonalkódok</string>
   <string name="preferences_decode_Data_Matrix_title">Data Matrix</string>

android/res/values-it/strings.xml

@@ -94,7 +94,7 @@
   <string name="preferences_bulk_mode_summary">scansione di codici a barre e salvare molte continuamente</string>
   <string name="preferences_bulk_mode_title">Bulk modalità di scansione</string>
   <string name="preferences_copy_to_clipboard_title">Copia negli appunti</string>
-  <string name="preferences_custom_product_search_summary">Utilizza %s come segnaposto per l\'ID del prodotto, e per il formato %f</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">Utilizza %s come segnaposto per l\'ID del prodotto, e per il formato %f</string>
   <string name="preferences_custom_product_search_title">URL ricerca prodotto personalizzata</string>
   <string name="preferences_decode_1D_title">Codice a barre 1D</string>
   <string name="preferences_decode_Data_Matrix_title">Data Matrix</string>

android/res/values-ja-rJP/strings.xml

@@ -94,7 +94,7 @@
   <string name="preferences_bulk_mode_summary">スキャンして保存する多くのバーコード連続</string>
   <string name="preferences_bulk_mode_title">バルクモードでのスキャン</string>
   <string name="preferences_copy_to_clipboard_title">クリップボードにコピーする</string>
-  <string name="preferences_custom_product_search_summary">URL中の「%s」はスキャン結果に置換される</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">URL中の「%s」はスキャン結果に置換される</string>
   <string name="preferences_custom_product_search_title">カスタム商品サーチ URL</string>
   <string name="preferences_decode_1D_title">1Dバーコードを読み取る</string>
   <string name="preferences_decode_Data_Matrix_title">デコードデータマトリックスコード</string>

android/res/values-kr/strings.xml

@@ -94,7 +94,7 @@
   <string name="preferences_bulk_mode_summary">다수의 바코드를 스캔하고 저장합니다.</string>
   <string name="preferences_bulk_mode_title">일괄 스캔 모드</string>
   <string name="preferences_copy_to_clipboard_title">복사하기</string>
-  <string name="preferences_custom_product_search_summary">%s를 제품 ID로, %f를 포맷으로 입력하여 주세요.</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">%s를 제품 ID로, %f를 포맷으로 입력하여 주세요.</string>
   <string name="preferences_custom_product_search_title">사용자 지정 검색 주소</string>
   <string name="preferences_decode_1D_title">1차원 바코드를 읽기</string>
   <string name="preferences_decode_Data_Matrix_title">데이터 행렬(Data Matrix)을 해석하기</string>

android/res/values-nl/strings.xml

@@ -94,7 +94,7 @@
   <string name="preferences_bulk_mode_summary">Scan continue barcodes en sla ze allemaal op</string>
   <string name="preferences_bulk_mode_title">Bulk scan modus</string>
   <string name="preferences_copy_to_clipboard_title">Kopieer naar plakbord</string>
-  <string name="preferences_custom_product_search_summary">Gebruik %s voor de plaats van het product ID en %f voor het formaat</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">Gebruik %s voor de plaats van het product ID en %f voor het formaat</string>
   <string name="preferences_custom_product_search_title">Zoek aangepaste URL</string>
   <string name="preferences_decode_1D_title">1D barcodes</string>
   <string name="preferences_decode_Data_Matrix_title">Data Matrix</string>

android/res/values-pl/strings.xml

@@ -94,7 +94,7 @@
   <string name="preferences_bulk_mode_summary">Skanowanie i zapisywanie wielu kodów kreskowych ciągle</string>
   <string name="preferences_bulk_mode_title">Luzem tryb skanowania</string>
   <string name="preferences_copy_to_clipboard_title">Kopiuj do schowka</string>
-  <string name="preferences_custom_product_search_summary">Użyj %s jako zamiennik dla ID produktu, a dla formatu %f</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">Użyj %s jako zamiennik dla ID produktu, a dla formatu %f</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_Data_Matrix_title">Dekoduj Decode Matrix</string>

android/res/values-pt/strings.xml

@@ -94,7 +94,7 @@
   <string name="preferences_bulk_mode_summary">Digitalizar e salvar muitas barras continuamente</string>
   <string name="preferences_bulk_mode_title">Bulk modo de digitalização</string>
   <string name="preferences_copy_to_clipboard_title">Copiar para a área de transferência</string>
-  <string name="preferences_custom_product_search_summary">Use %s como um espaço reservado para a identificação do produto, e para o formato %f</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">Use %s como um espaço reservado para a identificação do produto, e para o formato %f</string>
   <string name="preferences_custom_product_search_title">URL de pesquisa personalizada </string>
   <string name="preferences_decode_1D_title">Código de barras 1D</string>
   <string name="preferences_decode_Data_Matrix_title">Data Matrix</string>

android/res/values-ru/strings.xml

@@ -94,7 +94,7 @@
   <string name="preferences_bulk_mode_summary">Постоянно сканировать и сохранять штрих-коды</string>
   <string name="preferences_bulk_mode_title">Массовое сканирование</string>
   <string name="preferences_copy_to_clipboard_title">Копировать в буфер обмена</string>
-  <string name="preferences_custom_product_search_summary">%s будет заменён на ID товара, и %f на формат</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">%s будет заменён на ID товара, и %f на формат</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>

android/res/values-sl/strings.xml

@@ -94,7 +94,7 @@
   <string name="preferences_bulk_mode_summary">Beri in shrani več črtnih kod zaporedoma</string>
   <string name="preferences_bulk_mode_title">Branje črtnih kod na debelo</string>
   <string name="preferences_copy_to_clipboard_title">Kopiraj v beležnico</string>
-  <string name="preferences_custom_product_search_summary">Uporabi %s kot prostor za ID produkta ter %f za format</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">Uporabi %s kot prostor za ID produkta ter %f za format</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_Data_Matrix_title">Data Matrix</string>

android/res/values-sv/strings.xml

@@ -94,7 +94,7 @@
   <string name="preferences_bulk_mode_summary">Skanna och spara många streckkoder kontinuerligt</string>
   <string name="preferences_bulk_mode_title">Bulk skanningsläget</string>
   <string name="preferences_copy_to_clipboard_title">Kopiera till klippbordet</string>
-  <string name="preferences_custom_product_search_summary">Skriv %s där produktens ID ska placeras, och %f för format</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">Skriv %s där produktens ID ska placeras, och %f för format</string>
   <string name="preferences_custom_product_search_title">Anpassad sök-URL</string>
   <string name="preferences_decode_1D_title">1D steckkod</string>
   <string name="preferences_decode_Data_Matrix_title">Data Matrix</string>

android/res/values-tr/strings.xml

@@ -94,7 +94,7 @@
   <string name="preferences_bulk_mode_summary">Birden fazla barkodu toplu olarak taramak ve kaydetmek için</string>
   <string name="preferences_bulk_mode_title">Toplu tarama modu</string>
   <string name="preferences_copy_to_clipboard_title">Panoya kopyala</string>
-  <string name="preferences_custom_product_search_summary">Yer tutucu olarak ürün kimliği için %s, biçim için %f öğesini kullan</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">Yer tutucu olarak ürün kimliği için %s, biçim için %f öğesini kullan</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_Data_Matrix_title">Data Matrix</string>

android/res/values-zh-rCN/strings.xml

@@ -94,7 +94,7 @@
   <string name="preferences_bulk_mode_summary">连续扫描并保存多个条形码</string>
   <string name="preferences_bulk_mode_title">批量扫描模式</string>
   <string name="preferences_copy_to_clipboard_title">复制到剪切板</string>
-  <string name="preferences_custom_product_search_summary">使用%s作为产品ID占位符</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">使用%s作为产品ID占位符</string>
   <string name="preferences_custom_product_search_title">自定义搜索网址</string>
   <string name="preferences_decode_1D_title">扫描 一维条码</string>
   <string name="preferences_decode_Data_Matrix_title">扫描 DM码</string>

android/res/values-zh-rTW/strings.xml

@@ -94,7 +94,7 @@
   <string name="preferences_bulk_mode_summary">條碼掃描和挽救了許多人不斷</string>
   <string name="preferences_bulk_mode_title">批量掃描模式</string>
   <string name="preferences_copy_to_clipboard_title">復製到剪貼簿</string>
-  <string name="preferences_custom_product_search_summary">使用％s作為佔位符的產品ID</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">使用％s作為佔位符的產品ID</string>
   <string name="preferences_custom_product_search_title">自定義搜索網址</string>
   <string name="preferences_decode_1D_title">解碼一維條碼</string>
   <string name="preferences_decode_Data_Matrix_title">數據矩陣碼解碼</string>

android/res/values/strings.xml

@@ -94,7 +94,7 @@
   <string name="preferences_bulk_mode_summary">Scan and save many barcodes continuously</string>
   <string name="preferences_bulk_mode_title">Bulk scan mode</string>
   <string name="preferences_copy_to_clipboard_title">Copy to clipboard</string>
-  <string name="preferences_custom_product_search_summary">Use %s as a placeholder for the product ID, and %f for format</string>
+  <string name="preferences_custom_product_search_summary" formatted="false">Use %s as a placeholder for the product ID, and %f for format</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_Data_Matrix_title">Data Matrix</string>