diff options
author | cyberta <cyberta@riseup.net> | 2022-07-31 04:26:51 +0000 |
---|---|---|
committer | cyberta <cyberta@riseup.net> | 2022-07-31 04:26:51 +0000 |
commit | 3bdbe09ffd7f4039f37af93b0da6b0965e09e0bd (patch) | |
tree | 5de20333b567084efe8e260145c7d5ca374f8232 /app/src/main/res/layout/a_add_provider_tablet_scrollview.xml | |
parent | 2382b154db69a186e5fcf6600e5c4dceb11fb031 (diff) | |
parent | 897278b0fe93552108d3b7b6a75ccd92818a3b83 (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/main/res/layout/a_add_provider_tablet_scrollview.xml')
-rw-r--r-- | app/src/main/res/layout/a_add_provider_tablet_scrollview.xml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/src/main/res/layout/a_add_provider_tablet_scrollview.xml b/app/src/main/res/layout/a_add_provider_tablet_scrollview.xml index 4debbf9f..d3b8fc58 100644 --- a/app/src/main/res/layout/a_add_provider_tablet_scrollview.xml +++ b/app/src/main/res/layout/a_add_provider_tablet_scrollview.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<ScrollView - android:orientation="vertical" +<ScrollView android:orientation="vertical" style="@style/BitmaskActivity" android:layout_width="0dp" android:layout_height="0dp" @@ -15,7 +14,9 @@ android:isScrollContainer="true" android:fadeScrollbars="false" xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto"> + xmlns:app="http://schemas.android.com/apk/res-auto" + tools:viewBindingIgnore="true" + xmlns:tools="http://schemas.android.com/tools"> <LinearLayout android:id="@+id/content" |