diff options
| author |   Harsh Shandilya <me@msfjarvis.dev> | 2020-03-29 10:02:53 +0530 |
|---|---|---|
| committer |   Jason A. Donenfeld <Jason@zx2c4.com> | 2020-03-28 22:38:04 -0600 |
| commit | b00aacbc41e902f0d10a78db7ec216ceec48e035 (patch) | |
| tree | ed333af6ef5db859f8eaf12354d4e7c661faccc0 /ui/src/main/res/layout | |
| parent | MonkeyedTextInputEditText: make more robust (diff) | |
| download | wireguard-android-b00aacbc41e902f0d10a78db7ec216ceec48e035.tar.xz wireguard-android-b00aacbc41e902f0d10a78db7ec216ceec48e035.zip | |
Fix tunnel editor theming
Also set textInputStyle in the base theme to avoid setting styles to all elements
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
Diffstat (limited to 'ui/src/main/res/layout')
| -rw-r--r-- | ui/src/main/res/layout/tunnel_editor_fragment.xml | 7 | ||||
| -rw-r--r-- | ui/src/main/res/layout/tunnel_editor_peer.xml | 5 |
2 files changed, 0 insertions, 12 deletions
diff --git a/ui/src/main/res/layout/tunnel_editor_fragment.xml b/ui/src/main/res/layout/tunnel_editor_fragment.xml index 4c6d8fd4..d87e1efb 100644 --- a/ui/src/main/res/layout/tunnel_editor_fragment.xml +++ b/ui/src/main/res/layout/tunnel_editor_fragment.xml @@ -68,7 +68,6 @@ <com.google.android.material.textfield.TextInputLayout android:id="@+id/interface_name_layout" - style="@style/TextInputLayoutBase" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_margin="4dp" @@ -88,7 +87,6 @@ <com.google.android.material.textfield.TextInputLayout android:id="@+id/private_key_text_layout" - style="@style/TextInputLayoutBase" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_margin="4dp" @@ -111,7 +109,6 @@ <com.google.android.material.textfield.TextInputLayout android:id="@+id/public_key_label_layout" - style="@style/TextInputLayoutBase" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_margin="4dp" @@ -135,7 +132,6 @@ <com.google.android.material.textfield.TextInputLayout android:id="@+id/addresses_label_layout" - style="@style/TextInputLayoutBase" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_margin="4dp" @@ -156,7 +152,6 @@ <com.google.android.material.textfield.TextInputLayout android:id="@+id/listen_port_label_layout" - style="@style/TextInputLayoutBase" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_margin="4dp" @@ -178,7 +173,6 @@ <com.google.android.material.textfield.TextInputLayout android:id="@+id/dns_servers_label_layout" - style="@style/TextInputLayoutBase" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_margin="4dp" @@ -199,7 +193,6 @@ <com.google.android.material.textfield.TextInputLayout android:id="@+id/mtu_label_layout" - style="@style/TextInputLayoutBase" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_margin="4dp" diff --git a/ui/src/main/res/layout/tunnel_editor_peer.xml b/ui/src/main/res/layout/tunnel_editor_peer.xml index 77e47d40..2f3b0689 100644 --- a/ui/src/main/res/layout/tunnel_editor_peer.xml +++ b/ui/src/main/res/layout/tunnel_editor_peer.xml @@ -58,7 +58,6 @@ <com.google.android.material.textfield.TextInputLayout android:id="@+id/public_key_label_layout" - style="@style/TextInputLayoutBase" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_margin="4dp" @@ -79,7 +78,6 @@ <com.google.android.material.textfield.TextInputLayout android:id="@+id/pre_shared_key_label_layout" - style="@style/TextInputLayoutBase" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_margin="4dp" @@ -99,7 +97,6 @@ <com.google.android.material.textfield.TextInputLayout android:id="@+id/persistent_keepalive_label_layout" - style="@style/TextInputLayoutBase" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_margin="4dp" @@ -119,7 +116,6 @@ <com.google.android.material.textfield.TextInputLayout android:id="@+id/endpoint_label_layout" - style="@style/TextInputLayoutBase" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="4dp" @@ -138,7 +134,6 @@ <com.google.android.material.textfield.TextInputLayout android:id="@+id/allowed_ips_label_layout" - style="@style/TextInputLayoutBase" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="4dp" |