changed "device identifier" into "device name" and hide it from manual onbarding

This commit is contained in:
Peter Siegmund
2016-03-11 16:54:13 +01:00
parent 03b2b7497d
commit 68dd5187a0
4 changed files with 14 additions and 12 deletions
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="@dimen/side_padding">
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="@dimen/side_padding">
<com.sap.sailing.racecommittee.app.ui.views.FloatLabelLayout
android:layout_width="match_parent"
@@ -23,15 +23,17 @@
android:selectAllOnFocus="true"
android:textColor="@color/black"
android:textColorHint="@color/dialog_color_text"
tools:text="@string/preference_server_url_default" />
tools:text="@string/preference_server_url_default"/>
</com.sap.sailing.racecommittee.app.ui.views.FloatLabelLayout>
<com.sap.sailing.racecommittee.app.ui.views.FloatLabelLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/side_padding"
android:visibility="gone"
app:floatLabelPaddingLeft="@dimen/float_label_padding"
app:floatLabelTextAppearance="?attr/floatLabel">
app:floatLabelTextAppearance="?attr/floatLabel"
tools:visibility="visible">
<EditText
android:id="@+id/device_id"
@@ -42,6 +44,6 @@
android:selectAllOnFocus="true"
android:textColor="@color/black"
android:textColorHint="@color/dialog_color_text"
tools:text="N10" />
tools:text="N10"/>
</com.sap.sailing.racecommittee.app.ui.views.FloatLabelLayout>
</LinearLayout>
@@ -48,7 +48,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:text="@string/application_identifier"
android:text="@string/device_identifier"
android:textAppearance="?attr/textSmall"/>
<TextView
@@ -44,7 +44,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:text="@string/application_identifier"
android:text="@string/device_identifier"
android:textAppearance="?attr/textSmall"/>
<TextView
@@ -208,7 +208,7 @@
<string name="preference_racing_procedure_gatestart_haspathfinder_header">Pathfinder</string>
<string name="preference_racing_procedure_gatestart_hasadditionalgolfdowntime_description">Activate this option to enable choosing the additional Golf-Down time</string>
<string name="preference_racing_procedure_gatestart_hasadditionalgolfdowntime_header">Additional Golf-down time</string>
<string name="device_identifier">Device identifier</string>
<string name="device_identifier">Device Name</string>
<string name="synchronize_connection_settings_header">Synchronize with server</string>
<string name="synchronize_connection_settings_description">When creating a configuration on the server, click here to synchronize your app and connection settings via QRCode.</string>
<string name="update_app_header">Force update</string>