X-Git-Url: http://git.rot13.org/?p=zxing.git;a=blobdiff_plain;f=android%2Fres%2Fxml%2Fpreferences.xml;h=8ef9a1e346b94139646f79c8cedb34677ca36399;hp=514196e6d5258d4c6a95e23c1a43997c64d5d175;hb=5d9dd201546fdc3263d966f598b02770edba5a6d;hpb=f64eb0de61af3b4fe2c480e1ed6d3e2e18f82a05

diff --git a/android/res/xml/preferences.xml b/android/res/xml/preferences.xml
index 514196e6..8ef9a1e3 100755
--- a/android/res/xml/preferences.xml
+++ b/android/res/xml/preferences.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
- Copyright (C) 2008 Google Inc.
+ Copyright (C) 2008 ZXing authors
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  limitations under the License.
  -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-  <PreferenceCategory android:title="@string/preferences_general_title">
+  <PreferenceCategory android:title="@string/preferences_scanning_title">
     <CheckBoxPreference
         android:key="preferences_decode_1D"
         android:defaultValue="true"
@@ -24,11 +24,41 @@
         android:key="preferences_decode_QR"
         android:defaultValue="true"
         android:title="@string/preferences_decode_QR_title"/>
+    <CheckBoxPreference
+        android:key="preferences_decode_Data_Matrix"
+        android:defaultValue="true"
+        android:title="@string/preferences_decode_Data_Matrix_title"/>
   </PreferenceCategory>
-  <PreferenceCategory android:title="@string/preferences_sounds_title">
+  <PreferenceCategory android:title="@string/preferences_actions_title">
     <CheckBoxPreference
         android:key="preferences_play_beep"
         android:defaultValue="true"
         android:title="@string/preferences_play_beep_title"/>
+    <CheckBoxPreference
+        android:key="preferences_vibrate"
+        android:defaultValue="false"
+        android:title="@string/preferences_vibrate_title"/>
+    <CheckBoxPreference
+        android:key="preferences_copy_to_clipboard"
+        android:defaultValue="true"
+        android:title="@string/preferences_copy_to_clipboard_title"/>
+  </PreferenceCategory>
+  <PreferenceCategory android:title="@string/preferences_result_title">
+    <EditTextPreference
+        android:key="preferences_custom_product_search"
+        android:title="@string/preferences_custom_product_search_title"
+        android:summary="@string/preferences_custom_product_search_summary"/>
+  </PreferenceCategory>
+    <PreferenceCategory android:title="@string/preferences_general_title">
+    <CheckBoxPreference
+        android:key="preferences_front_light"
+        android:defaultValue="false"
+        android:title="@string/preferences_front_light_title"
+        android:summary="@string/preferences_front_light_summary"/>
+    <CheckBoxPreference
+        android:key="preferences_bulk_mode"
+        android:defaultValue="false"
+        android:title="@string/preferences_bulk_mode_title"
+        android:summary="@string/preferences_bulk_mode_summary"/>
   </PreferenceCategory>
 </PreferenceScreen>