summaryrefslogtreecommitdiff
path: root/app/src/production
diff options
context:
space:
mode:
authorcyberta <cyberta@riseup.net>2022-07-31 04:26:51 +0000
committercyberta <cyberta@riseup.net>2022-07-31 04:26:51 +0000
commit3bdbe09ffd7f4039f37af93b0da6b0965e09e0bd (patch)
tree5de20333b567084efe8e260145c7d5ca374f8232 /app/src/production
parent2382b154db69a186e5fcf6600e5c4dceb11fb031 (diff)
parent897278b0fe93552108d3b7b6a75ccd92818a3b83 (diff)
Merge branch 'obfuscation_gateway_pinning' into 'master'1.1.5RC1
Beta Release - Obfuscation gateway pinning See merge request leap/bitmask_android!201
Diffstat (limited to 'app/src/production')
-rw-r--r--app/src/production/res/layout-xlarge/d_new_provider.xml5
-rw-r--r--app/src/production/res/layout/d_new_provider.xml4
2 files changed, 7 insertions, 2 deletions
diff --git a/app/src/production/res/layout-xlarge/d_new_provider.xml b/app/src/production/res/layout-xlarge/d_new_provider.xml
index 12616625..6e64c8c0 100644
--- a/app/src/production/res/layout-xlarge/d_new_provider.xml
+++ b/app/src/production/res/layout-xlarge/d_new_provider.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:textSize="24sp" >
+ android:textSize="24sp"
+ tools:viewBindingIgnore="true"
+ >
<EditText
android:id="@+id/new_provider_url"
diff --git a/app/src/production/res/layout/d_new_provider.xml b/app/src/production/res/layout/d_new_provider.xml
index 36eb0d6a..e58db08a 100644
--- a/app/src/production/res/layout/d_new_provider.xml
+++ b/app/src/production/res/layout/d_new_provider.xml
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:orientation="vertical" >
+ android:orientation="vertical"
+ tools:viewBindingIgnore="true">
<EditText
android:id="@+id/new_provider_url"