TRACKING APP: Unique device id

This commit is contained in:
Lukas Zielinski committed 2014-11-26 14:08:01 +01:00
1 parent d9b6ec799e
commit d7ffd34dfb
12 files changed
+89 -28

No files matched your search

@@ -8,7 +8,7 @@
<string name="options_menu_settings">Einstellungen</string>
<string name="options_menu_checkout">Checkout</string>
<string name="settings_category_general">General</string>
<string name="settings_category_connection">Verbindung</string>
<string name="settings_category_other">Andere Einstellungen</string>
<string name="scan_hint">Der QR-Code befindet sich auf Ihrer Teilnahmebestätigung</string>
<string name="server_url">Server</string>
<string name="device_identifier">Geräte-ID</string>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
<string name="preference_device_identifier_key">deviceIdentifier</string>
<string name="preference_device_identifier_default">147d8230-4db0-11e4-916c-0800200c9a66</string>
<string name="preference_device_identifier_default"></string>
<!-- override default values of android.shared -->
<string name="app_folder">tracking</string>
@@ -9,7 +9,7 @@
<string name="options_menu_settings">Settings</string>
<string name="settings_category_general">General</string>
<string name="options_menu_checkout">Checkout</string>
<string name="settings_category_connection">Connection</string>
<string name="settings_category_other">Other Settings</string>
<string name="server_url">Server</string>
<string name="device_identifier">Device Identifier</string>
<string name="play_services_available">Google Play services is available</string>
@@ -14,25 +14,12 @@
</PreferenceCategory>
<!-- Connection -->
<PreferenceCategory android:title="@string/settings_category_connection" >
<PreferenceCategory android:title="@string/settings_category_other" >
<EditTextPreference
android:defaultValue="@string/preference_device_identifier_default"
android:key="@string/preference_device_identifier_key"
android:summary="@string/empty"
android:title="@string/device_identifier" />
<EditTextPreference
android:defaultValue="@string/preference_server_url_default"
android:key="@string/preference_server_url_key"
android:summary="@string/empty"
android:title="@string/server_url" />
<EditTextPreference
android:defaultValue="@string/preference_gps_fix_interval_ms_default"
android:key="@string/preference_gps_fix_interval_ms_key"
android:summary="@string/empty"
android:title="@string/gps_fix_interval"
android:inputType="number"
/>
android:title="@string/device_identifier" android:selectable="false"/>
</PreferenceCategory>
</PreferenceScreen>