1.修改Android Apex Drivers，删除Zxing。

ApexDrivers/apexdriverslib/src/main/AndroidManifest.xml

@@ -9,18 +9,13 @@
 
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
-    <uses-permission android:name="android.permission.CAMERA"/>
-    <uses-permission android:name="android.permission.WAKE_LOCK"/>
-    <uses-permission android:name="android.permission.VIBRATE"/>
-    <uses-permission android:name="android.permission.FLASHLIGHT"/>
+
     <uses-permission android:name="android.alarm.permission.SET_ALARM"/>
     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 
-    <!-- 调用硬件相机权限 -->
-    <uses-feature android:name="android.hardware.camera"/>
-    <uses-feature android:name="android.hardware.camera.autofocus"/>
+
     <!-- 文件读写权限 -->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
@@ -92,17 +87,7 @@
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan"
             />
-        <activity
-            android:name=".camera.PreferencesActivity"
-            android:screenOrientation="portrait"/>
-        <activity
-            android:name=".codescanner.CaptureActivity"
-            android:clearTaskOnLaunch="true"
-            android:label="Scan"
-            android:screenOrientation="sensorLandscape"
-            android:stateNotNeeded="true"
-            android:theme="@style/CaptureTheme"
-            android:windowSoftInputMode="stateAlwaysHidden"/>
+
         <activity
             android:name=".update.PhotoPreviewActivity"
             android:screenOrientation="portrait"/>
@@ -129,7 +114,6 @@
             android:enabled="true"
             android:exported="true"
             android:permission="android.permission.RECEIVE_BOOT_COMPLETED">
-            >
             <intent-filter>
 
                 <action android:name="REDANT.BROADCAST.ACTION_REDANT_INIT_ALARM" />

ApexDrivers/apexdriverslib/src/main/java/com/usai/redant/apexdrivers/update/UpdateActivity.java

@@ -35,12 +35,10 @@ import android.widget.TimePicker;
 import android.widget.Toast;
 
 import com.usai.redant.apexdrivers.ApexDriverApplication;
-import com.usai.redant.apexdrivers.MainActivity;
 import com.usai.redant.apexdrivers.R;
 import com.usai.redant.apexdrivers.SaveInstanceHelper;
 import com.usai.redant.apexdrivers.base.BasicActivity;
-import com.usai.redant.apexdrivers.codescanner.CaptureActivity;
-import com.usai.redant.apexdrivers.filter.OrderFilterActivity;
+import com.usai.redant.rautils.zxing.codescanner.CaptureActivity;
 import com.usai.redant.apexdrivers.home.HomeFragment;
 import com.usai.redant.apexdrivers.network.Network;
 import com.usai.redant.apexdrivers.photoCell.PhotoItemModel;
@@ -68,7 +66,6 @@ import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.lang.ref.WeakReference;
-import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -76,10 +73,6 @@ import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 
-import static com.usai.redant.apexdrivers.update.model.UpdateBaseModel.UpdateTypeDate;
-import static com.usai.redant.apexdrivers.update.model.UpdateBaseModel.UpdateTypeInput;
-import static com.usai.redant.apexdrivers.update.model.UpdateBaseModel.UpdateTypeMultPhoto;
-import static com.usai.redant.apexdrivers.update.model.UpdateBaseModel.UpdateTypeSignature;
 import static com.usai.redant.apexdrivers.update.model.UpdateDateModel.DateModeDate;
 import static com.usai.redant.apexdrivers.update.model.UpdateDateModel.DateModeTime;
 import static com.usai.redant.rautils.utils.Network.RESULT_TRUE;

ApexDrivers/apexdriverslib/src/main/res/layout/capture.xml

@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- 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.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <SurfaceView android:id="@+id/preview_view"
-               android:layout_width="fill_parent"
-               android:layout_height="fill_parent"/>
-
-  <com.usai.redant.apexdrivers.codescanner.ViewfinderView
-      android:id="@+id/viewfinder_view"
-      android:layout_width="fill_parent"
-      android:layout_height="fill_parent"/>
-
-  <!-- <LinearLayout android:id="@+id/result_view"
-                android:orientation="vertical"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:background="@color/result_view"
-                android:visibility="gone"
-                android:baselineAligned="false">
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:gravity="center"
-        android:padding="@dimen/standard_padding">
-
-      <LinearLayout
-          android:orientation="vertical"
-          android:layout_width="wrap_content"
-          android:layout_height="fill_parent"
-          android:gravity="right|center_vertical">
-
-        <ImageView android:id="@+id/barcode_image_view"
-                   android:layout_width="160dip"
-                   android:layout_height="wrap_content"
-                   android:maxWidth="160dip"
-                   android:maxHeight="160dip"
-                   android:layout_marginBottom="@dimen/half_padding"
-                   android:adjustViewBounds="true"
-                   android:scaleType="centerInside"/>
-
-        <LinearLayout
-          android:orientation="horizontal"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content">
-
-          <TextView android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/msg_default_format"
-                    android:textColor="@color/result_minor_text"
-                    android:textStyle="bold"
-                    android:paddingRight="@dimen/half_padding"/>
-
-          <TextView android:id="@+id/format_text_view"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/result_minor_text"/>
-
-        </LinearLayout>
-
-        <LinearLayout
-          android:orientation="horizontal"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content">
-
-          <TextView android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/msg_default_type"
-                    android:textColor="@color/result_minor_text"
-                    android:textStyle="bold"
-                    android:paddingRight="@dimen/half_padding"/>
-
-          <TextView android:id="@+id/type_text_view"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/result_minor_text"/>
-
-        </LinearLayout>
-
-        <LinearLayout
-          android:orientation="horizontal"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content">
-
-          <TextView android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/msg_default_time"
-                    android:textColor="@color/result_minor_text"
-                    android:textStyle="bold"
-                    android:paddingRight="@dimen/half_padding"/>
-
-          <TextView android:id="@+id/time_text_view"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/result_minor_text"/>
-
-        </LinearLayout>
-
-        <LinearLayout
-          android:orientation="horizontal"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content">
-
-          <TextView android:id="@+id/meta_text_view_label"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/msg_default_meta"
-                    android:textColor="@color/result_minor_text"
-                    android:textStyle="bold"
-                    android:paddingRight="@dimen/half_padding"/>
-
-          <TextView android:id="@+id/meta_text_view"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/result_minor_text"/>
-
-        </LinearLayout>
-
-      </LinearLayout>
-
-      <ScrollView
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content">
-
-        <LinearLayout
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:orientation="vertical">
-
-          <TextView android:id="@+id/contents_text_view"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/result_text"
-                    android:textColorLink="@color/result_text"
-                    android:textSize="22sp"
-                    android:paddingLeft="12dip"
-                    android:autoLink="web"/>
-
-          <TextView android:id="@+id/contents_supplement_text_view"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/result_text"
-                    android:textColorLink="@color/result_text"
-                    android:paddingLeft="12dip"
-                    android:autoLink="web"/>
-
-        </LinearLayout>
-
-      </ScrollView>
-
-    </LinearLayout>
-
-    <LinearLayout android:id="@+id/result_button_view"
-                  android:layout_width="fill_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="horizontal"
-                  android:gravity="center">
-
-      <Button style="@style/ResultButton"
-              android:visibility="gone"/>
-
-      <Button style="@style/ResultButton"
-              android:visibility="gone"/>
-
-      <Button style="@style/ResultButton"
-              android:visibility="gone"/>
-
-      <Button style="@style/ResultButton"
-              android:visibility="gone"/>
-
-    </LinearLayout>
-
-  </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"/>
-
-  <TextView
-      android:id="@+id/textView1"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:text=""
-      android:layout_gravity="center_horizontal"
-      android:textAppearance="?android:attr/textAppearanceLarge" />
-  <Button
-      android:id="@+id/btn_switch"
-      android:layout_width="50dp"
-      android:layout_height="50dp"
-      android:layout_marginRight="20dp"
-      android:layout_gravity="center_vertical|right"
-      android:text="" />
-
-</merge>

ApexDrivers/apexdriverslib/src/main/res/values-zh/strings.xml

@@ -25,44 +25,6 @@
     <string name="str_retrievepass">找回密码</string>
     <string name="title_activity_detail">DetailActivity</string>
 
-    <string name="msg_default_status">Place a barcode inside the viewfinder rectangle to scan it.</string>
-
-    <string name="preferences_actions_title">When a barcode is found\u2026</string>
-    <string name="preferences_auto_focus_title">Use auto focus</string>
-    <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" 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_Data_Matrix_title">Data Matrix</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>
-    <string name="preferences_disable_continuous_focus_title">No continuous focus</string>
-    <string name="preferences_front_light_summary">Improves scanning in low light on some phones, but may cause glare. Does not work on all phones.</string>
-    <string name="preferences_front_light_title">Use front light</string>
-    <string name="preferences_front_light_auto">Automatic</string>
-    <string name="preferences_front_light_off">Off</string>
-    <string name="preferences_front_light_on">On</string>
-    <string name="preferences_general_title">General settings</string>
-    <string name="preferences_invert_scan_title">Invert scan</string>
-    <string name="preferences_invert_scan_summary">Scan for white barcodes on black background. Not available on some devices.</string>
-    <string name="preferences_play_beep_title">Beep</string>
-    <string name="preferences_remember_duplicates_summary">Store multiple scans of the same barcode in History</string>
-    <string name="preferences_remember_duplicates_title">Remember duplicates</string>
-    <string name="preferences_result_title">Result settings</string>
-    <string name="preferences_scanning_title">When scanning for barcodes, decode\u2026</string>
-    <string name="preferences_search_country">Search country</string>
-    <string name="preferences_try_bsplus">Try Barcode Scanner+</string>
-    <string name="preferences_try_bsplus_summary">Enhanced with new features and interface</string>
-    <string name="preferences_supplemental_summary">Try to retrieve more information about the barcode contents</string>
-    <string name="preferences_supplemental_title">Retrieve more info</string>
-    <string name="preferences_vibrate_title">Vibrate</string>
-
-    <string name="msg_camera_framework_bug">对不起，Android相机遇到了问题。 您可能需要重新启动设备.</string>
-
-
     <!--Common-->
     <string name="button_ok">确定</string>
     <string name="loading">加载中...</string>

ApexDrivers/apexdriverslib/src/main/res/values/arrays.xml

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string-array name="country_codes">
-    <item>-</item>
-    <item>AR</item>
-    <item>AU</item>
-    <item>BR</item>
-    <item>BG</item>
-    <item>CA</item>
-    <item>CH</item>
-    <item>CN</item>
-    <item>CZ</item>
-    <item>DE</item>
-    <item>DK</item>
-    <item>ES</item>
-    <item>FI</item>
-    <item>FR</item>
-    <item>GB</item>
-    <item>GR</item>
-    <item>HU</item>
-    <item>ID</item>
-    <item>IT</item>
-    <item>JP</item>
-    <item>KR</item>
-    <item>NL</item>
-    <item>PL</item>
-    <item>PT</item>
-    <item>RO</item>    
-    <item>RU</item>
-    <item>SE</item>
-    <item>SK</item>
-    <item>SI</item>
-    <item>TR</item>
-    <item>TW</item>
-    <item>US</item>
-  </string-array>
-  <string-array name="preferences_front_light_values">
-    <item>ON</item>
-    <item>AUTO</item>
-    <item>OFF</item>
-  </string-array>
-  <string-array name="preferences_front_light_options">
-    <item>@string/preferences_front_light_on</item>
-    <item>@string/preferences_front_light_auto</item>
-    <item>@string/preferences_front_light_off</item>
-  </string-array>
-</resources>

ApexDrivers/apexdriverslib/src/main/res/values/colors.xml

@@ -7,16 +7,6 @@
     <color name="icon_gray">#444445</color>
     <color name="icon_red">#b22123</color>
 
-    <color name="transparent">#00000000</color>
-    <color name="status_text">#ffffffff</color>
-
-    <color name="viewfinder_mask">#60000000</color>
-    <color name="result_view">#b0000000</color>
-    <color name="viewfinder_laser">#ffcc0000</color>
-    <color name="possible_result_points">#c0ffbd21</color>
-
-    <color name="message_success">#ee00ff00</color>
-    <color name="message_fail">#eeff0000</color>
 
     <color name="blue">#2172ff</color>
 

ApexDrivers/apexdriverslib/src/main/res/values/ids.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- 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.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<resources>
-  <item type="id" name="decode"/>
-  <item type="id" name="decode_failed"/>
-  <item type="id" name="decode_succeeded"/>
-  <item type="id" name="launch_product_query"/>
-  <item type="id" name="quit"/>
-  <item type="id" name="restart_preview"/>
-  <item type="id" name="return_scan_result"/>
-
-  <item type="id" name="action_sign_in"/>
-</resources>

ApexDrivers/apexdriverslib/src/main/res/values/strings.xml

@@ -25,43 +25,6 @@
     <string name="str_retrievepass">Retrieve password</string>
     <string name="title_activity_detail">DetailActivity</string>
 
-    <string name="msg_default_status">Place a barcode inside the viewfinder rectangle to scan it.</string>
-
-    <string name="preferences_actions_title">When a barcode is found\u2026</string>
-    <string name="preferences_auto_focus_title">Use auto focus</string>
-    <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" 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_Data_Matrix_title">Data Matrix</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>
-    <string name="preferences_disable_continuous_focus_title">No continuous focus</string>
-    <string name="preferences_front_light_summary">Improves scanning in low light on some phones, but may cause glare. Does not work on all phones.</string>
-    <string name="preferences_front_light_title">Use front light</string>
-    <string name="preferences_front_light_auto">Automatic</string>
-    <string name="preferences_front_light_off">Off</string>
-    <string name="preferences_front_light_on">On</string>
-    <string name="preferences_general_title">General settings</string>
-    <string name="preferences_invert_scan_title">Invert scan</string>
-    <string name="preferences_invert_scan_summary">Scan for white barcodes on black background. Not available on some devices.</string>
-    <string name="preferences_play_beep_title">Beep</string>
-    <string name="preferences_remember_duplicates_summary">Store multiple scans of the same barcode in History</string>
-    <string name="preferences_remember_duplicates_title">Remember duplicates</string>
-    <string name="preferences_result_title">Result settings</string>
-    <string name="preferences_scanning_title">When scanning for barcodes, decode\u2026</string>
-    <string name="preferences_search_country">Search country</string>
-    <string name="preferences_try_bsplus">Try Barcode Scanner+</string>
-    <string name="preferences_try_bsplus_summary">Enhanced with new features and interface</string>
-    <string name="preferences_supplemental_summary">Try to retrieve more information about the barcode contents</string>
-    <string name="preferences_supplemental_title">Retrieve more info</string>
-    <string name="preferences_vibrate_title">Vibrate</string>
-
-    <string name="msg_camera_framework_bug">Sorry, the Android camera encountered a problem. You may need to restart the device.</string>
-
     <!--Common-->
     <string name="button_ok">OK</string>
     <string name="loading">loading...</string>

ApexDrivers/apexdriverslib/src/main/res/values/themes.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2012 ZXing authors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<resources>
-  <style name="CaptureTheme" parent="android:Theme.Holo">
-    <item name="android:windowFullscreen">true</item>
-    <item name="android:windowContentOverlay">@null</item>
-    <item name="android:windowActionBarOverlay">true</item>
-    <item name="android:windowActionModeOverlay">true</item>
-  </style>
-
-</resources>

ApexDrivers/apexdriverslib/src/main/res/xml/preferences.xml

@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- 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.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-  <PreferenceCategory android:title="@string/preferences_scanning_title">
-    <CheckBoxPreference
-        android:key="preferences_decode_1D"
-        android:defaultValue="true"
-        android:title="@string/preferences_decode_1D_title"/>
-    <CheckBoxPreference
-        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_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"/>
-    <CheckBoxPreference
-        android:key="preferences_remember_duplicates"
-        android:defaultValue="false"
-        android:title="@string/preferences_remember_duplicates_title"
-        android:summary="@string/preferences_remember_duplicates_summary"/>
-    <CheckBoxPreference
-        android:key="preferences_supplemental"
-        android:defaultValue="true"
-        android:title="@string/preferences_supplemental_title"
-        android:summary="@string/preferences_supplemental_summary"/>
-  </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">
-    <ListPreference
-        android:entries="@array/preferences_front_light_options"
-        android:entryValues="@array/preferences_front_light_values"
-        android:key="preferences_front_light_mode"
-        android:defaultValue="OFF"
-        android:title="@string/preferences_front_light_title"
-        android:summary="@string/preferences_front_light_summary"/>
-    <CheckBoxPreference
-        android:key="preferences_auto_focus"
-        android:defaultValue="true"
-        android:title="@string/preferences_auto_focus_title"/>
-    <CheckBoxPreference
-        android:key="preferences_invert_scan"
-        android:defaultValue="false"
-        android:title="@string/preferences_invert_scan_title"
-        android:summary="@string/preferences_invert_scan_summary"/>
-    <CheckBoxPreference
-        android:key="preferences_bulk_mode"
-        android:defaultValue="false"
-        android:title="@string/preferences_bulk_mode_title"
-        android:summary="@string/preferences_bulk_mode_summary"/>
-    <ListPreference
-        android:key="preferences_search_country"
-        android:defaultValue="-"
-        android:entries="@array/country_codes"
-        android:entryValues="@array/country_codes"
-        android:title="@string/preferences_search_country"/>
-  </PreferenceCategory>
-  <PreferenceCategory android:title="@string/preferences_device_bug_workarounds_title">
-    <CheckBoxPreference
-        android:key="preferences_disable_continuous_focus"
-        android:defaultValue="true"
-        android:title="@string/preferences_disable_continuous_focus_title"
-        android:summary="@string/preferences_disable_continuous_focus_summary"/>
-    <!--
-    <CheckBoxPreference
-        android:key="preferences_disable_exposure"
-        android:defaultValue="false"
-        android:title="@string/preferences_disable_exposure_title"/>
-     -->
-  </PreferenceCategory>
-  <PreferenceCategory android:title="@string/preferences_try_bsplus">
-    <Preference android:title="@string/preferences_try_bsplus"
-                android:summary="@string/preferences_try_bsplus_summary">
-      <intent android:action="android.intent.action.VIEW" android:data="market://details?id=com.srowen.bs.android" />
-    </Preference>
-  </PreferenceCategory>
-</PreferenceScreen>