diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2020-09-15 13:29:53 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2020-09-15 18:53:30 +0200 |
| commit | d79cdb0d41f05f53c13a0b247f54c28f42609e2f (patch) | |
| tree | c28ea457fd49356f409a0f49b48178df317e8165 /ui/src/main/res/layout/tunnel_editor_peer.xml | |
| parent | wireguard-tools: bump to fix invalid free (diff) | |
| download | wireguard-android-d79cdb0d41f05f53c13a0b247f54c28f42609e2f.tar.xz wireguard-android-d79cdb0d41f05f53c13a0b247f54c28f42609e2f.zip | |
MonkeyedTextInputEditText: au revoir
Remember to go back to using com.google.android.material when
1.3.0-alpha03 comes out.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'ui/src/main/res/layout/tunnel_editor_peer.xml')
| -rw-r--r-- | ui/src/main/res/layout/tunnel_editor_peer.xml | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/ui/src/main/res/layout/tunnel_editor_peer.xml b/ui/src/main/res/layout/tunnel_editor_peer.xml index 88c9044b..76aaa1cd 100644 --- a/ui/src/main/res/layout/tunnel_editor_peer.xml +++ b/ui/src/main/res/layout/tunnel_editor_peer.xml @@ -84,11 +84,12 @@ android:layout_height="wrap_content" android:layout_margin="4dp" android:hint="@string/pre_shared_key" + app:expandedHintEnabled="false" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/public_key_label_layout"> - <com.wireguard.android.widget.MonkeyedTextInputEditText + <com.google.android.material.textfield.TextInputEditText android:id="@+id/pre_shared_key_text" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -106,18 +107,19 @@ android:layout_height="wrap_content" android:layout_margin="4dp" android:hint="@string/persistent_keepalive" - app:suffixText="@{@plurals/persistent_keepalive_seconds_suffix(BindingAdapters.tryParseInt(item.persistentKeepalive))}" + app:expandedHintEnabled="false" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/pre_shared_key_label_layout"> + app:layout_constraintTop_toBottomOf="@id/pre_shared_key_label_layout" + app:suffixText="@{@plurals/persistent_keepalive_seconds_suffix(BindingAdapters.tryParseInt(item.persistentKeepalive))}"> - <com.wireguard.android.widget.MonkeyedTextInputEditText + <com.google.android.material.textfield.TextInputEditText android:id="@+id/persistent_keepalive_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/hint_optional_discouraged" android:inputType="number" - android:text="@={item.persistentKeepalive}"/> + android:text="@={item.persistentKeepalive}" /> </com.google.android.material.textfield.TextInputLayout> <com.google.android.material.textfield.TextInputLayout |