nutomic
/
syncthing-android
mirror of https://github.com/syncthing/syncthing-android.git
1
0
Fork 0
Code Releases Activity

Added input type field to text inputs (fixes #542).

This commit is contained in:
Felix Ableitner 2016-02-09 21:50:33 +01:00
parent cda06d8938
commit 7117933b6d
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/res/layout/fragment_device.xml
View File

@ -32,8 +32,7 @@
android:hint="@string/device_id" android:hint="@string/device_id"
android:imeOptions="actionNext" android:imeOptions="actionNext"
android:inputType="textNoSuggestions|textMultiLine" android:inputType="textNoSuggestions|textMultiLine"
android:nextFocusForward="@+id/name" android:nextFocusForward="@+id/name" />
tools:text="@string/device_id_placeholder" />
<ImageView <ImageView
android:id="@+id/qrButton" android:id="@+id/qrButton"
@ -66,7 +65,8 @@
android:drawableLeft="@drawable/ic_link_black_24dp" android:drawableLeft="@drawable/ic_link_black_24dp"
android:drawableStart="@drawable/ic_link_black_24dp" android:drawableStart="@drawable/ic_link_black_24dp"
android:hint="@string/addresses" android:hint="@string/addresses"
android:imeOptions="actionDone" /> android:imeOptions="actionDone"
android:inputType="textNoSuggestions"/>
<LinearLayout <LinearLayout
android:id="@+id/compressionContainer" android:id="@+id/compressionContainer"

27
src/main/res/xml/app_settings.xml
View File

@ -55,24 +55,28 @@
<EditTextPreference <EditTextPreference
android:key="deviceName" android:key="deviceName"
android:title="@string/device_name" android:title="@string/device_name"
android:persistent="false" /> android:persistent="false"
android:inputType="textCapWords" />
<EditTextPreference <EditTextPreference
android:key="listenAddress" android:key="listenAddress"
android:title="@string/listen_address" android:title="@string/listen_address"
android:persistent="false" /> android:persistent="false"
android:inputType="textNoSuggestions" />
<EditTextPreference <EditTextPreference
android:key="maxRecvKbps" android:key="maxRecvKbps"
android:title="@string/max_recv_kbps" android:title="@string/max_recv_kbps"
android:numeric="integer" android:numeric="integer"
android:persistent="false" /> android:persistent="false"
android:inputType="number" />
<EditTextPreference <EditTextPreference
android:key="maxSendKbps" android:key="maxSendKbps"
android:title="@string/max_send_kbps" android:title="@string/max_send_kbps"
android:numeric="integer" android:numeric="integer"
android:persistent="false" /> android:persistent="false"
android:inputType="number" />
<CheckBoxPreference <CheckBoxPreference
android:key="globalAnnounceEnabled" android:key="globalAnnounceEnabled"
@ -92,7 +96,8 @@
<EditTextPreference <EditTextPreference
android:key="globalAnnounceServers" android:key="globalAnnounceServers"
android:title="@string/global_announce_server" android:title="@string/global_announce_server"
android:persistent="false" /> android:persistent="false"
android:inputType="textNoSuggestions" />
<CheckBoxPreference <CheckBoxPreference
android:key="urAccepted" android:key="urAccepted"
@ -108,15 +113,18 @@
<EditTextPreference <EditTextPreference
android:key="address" android:key="address"
android:title="@string/gui_address" android:title="@string/gui_address"
android:persistent="false" /> android:persistent="false"
android:inputType="textNoSuggestions" />
<EditTextPreference <EditTextPreference
android:key="gui_user" android:key="gui_user"
android:title="@string/gui_user" /> android:title="@string/gui_user"
android:inputType="textCapWords" />
<EditTextPreference <EditTextPreference
android:key="gui_password" android:key="gui_password"
android:title="@string/gui_password" /> android:title="@string/gui_password"
android:inputType="textVisiblePassword" />
</PreferenceScreen> </PreferenceScreen>
@ -131,7 +139,8 @@
<EditTextPreference <EditTextPreference
android:key="sttrace" android:key="sttrace"
android:title="@string/sttrace_title" android:title="@string/sttrace_title"
android:singleLine="true" /> android:singleLine="true"
android:inputType="textNoSuggestions"/>
<Preference <Preference
android:key="streset" android:key="streset"