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

Now history can be disabled

Browse source
This commit is contained in:
MicheleMas 2015-01-23 11:40:25 +01:00
parent 71d83953bd
commit 7c79a96bb0
5 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -119,6 +119,8 @@
<string name="preferences_play_beep_title">Suona</string>
<string name="preferences_remember_duplicates_summary">Mantieni scansioni multiple del codice a barre nella stessa Cronologia</string>
<string name="preferences_remember_duplicates_title">Ricorda duplicati</string>
<string name="preferences_history_summary">Mantieni le tue scansioni nella Cronologia</string>
<string name="preferences_history_title">Aggiungi alla cronologia</string>
<string name="preferences_result_title">Impostazioni risultato</string>
<string name="preferences_scanning_title">Durante la scansione di codici a barre, decodifica\u2026</string>
<string name="preferences_search_country">Cerca paese</string>

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

@ -119,6 +119,8 @@
<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_history_summary">Store your scans in History</string>
<string name="preferences_history_title">Add to History</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>

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

@ -63,6 +63,11 @@
android:defaultValue="false"
android:title="@string/preferences_remember_duplicates_title"
android:summary="@string/preferences_remember_duplicates_summary"/>
<CheckBoxPreference
android:key="preferences_history"
android:defaultValue="true"
android:title="@string/preferences_history_title"
android:summary="@string/preferences_history_summary"/>
<CheckBoxPreference
android:key="preferences_supplemental"
android:defaultValue="true"

5
android/src/com/google/zxing/client/android/CaptureActivity.java
View file

@ -433,7 +433,10 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
boolean fromLiveScan = barcode != null;
if (fromLiveScan) {
historyManager.addHistoryItem(rawResult, resultHandler);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
boolean shouldSaveScan = prefs.getBoolean(PreferencesActivity.KEY_ENABLE_HISTORY, true);
if(shouldSaveScan)
historyManager.addHistoryItem(rawResult, resultHandler);
// Then not from history, so beep/vibrate and we have an image to draw on
beepManager.playBeepSoundAndVibrate();
drawResultPoints(barcode, scaleFactor, rawResult);

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

@ -42,6 +42,7 @@ public final class PreferencesActivity extends Activity {
public static final String KEY_FRONT_LIGHT_MODE = "preferences_front_light_mode";
public static final String KEY_BULK_MODE = "preferences_bulk_mode";
public static final String KEY_REMEMBER_DUPLICATES = "preferences_remember_duplicates";
public static final String KEY_ENABLE_HISTORY = "preferences_history";
public static final String KEY_SUPPLEMENTAL = "preferences_supplemental";
public static final String KEY_AUTO_FOCUS = "preferences_auto_focus";
public static final String KEY_INVERT_SCAN = "preferences_invert_scan";