X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fdomain_settings_fragment.xml;h=d71868b2c9076e3d3f8c7e03d5a3d971e8c346ef;hb=930adb36c4ef786be96f8d11a238c87ac987c82e;hp=64d3747f009c5ae759b7c2a8bd9c067a3e5a78ff;hpb=6ccecb3374c1988aef2650a87dac20923ce3aa2f;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/layout/domain_settings_fragment.xml b/app/src/main/res/layout/domain_settings_fragment.xml
index 64d3747f..d71868b2 100644
--- a/app/src/main/res/layout/domain_settings_fragment.xml
+++ b/app/src/main/res/layout/domain_settings_fragment.xml
@@ -294,7 +294,7 @@
                 android:layout_marginStart="8dp"
                 android:layout_marginTop="14dp"
                 android:layout_marginBottom="14dp"
-                android:text="@string/fanboy_annoyance_list"
+                android:text="@string/fanboys_annoyance_list"
                 android:textColor="?android:textColorPrimary"
                 android:textSize="18sp" />
         </LinearLayout>
@@ -321,7 +321,61 @@
                 android:layout_marginStart="8dp"
                 android:layout_marginTop="14dp"
                 android:layout_marginBottom="14dp"
-                android:text="@string/fanboy_social_blocking_list"
+                android:text="@string/fanboys_social_blocking_list"
+                android:textColor="?android:textColorPrimary"
+                android:textSize="18sp" />
+        </LinearLayout>
+
+        <!-- UltraPrivacy. -->
+        <LinearLayout
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:orientation="horizontal" >
+
+            <ImageView
+                android:id="@+id/domain_settings_ultraprivacy_imageview"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_marginTop="1dp"
+                android:layout_marginEnd="10dp"
+                android:layout_gravity="center_vertical"
+                tools:ignore="contentDescription" />
+
+            <Switch
+                android:id="@+id/domain_settings_ultraprivacy_switch"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="14dp"
+                android:layout_marginBottom="14dp"
+                android:text="@string/ultraprivacy"
+                android:textColor="?android:textColorPrimary"
+                android:textSize="18sp" />
+        </LinearLayout>
+
+        <!-- Block All Third Party Requests. -->
+        <LinearLayout
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:orientation="horizontal" >
+
+            <ImageView
+                android:id="@+id/domain_settings_block_all_third_party_requests_imageview"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_marginTop="1dp"
+                android:layout_marginEnd="10dp"
+                android:layout_gravity="center_vertical"
+                tools:ignore="contentDescription" />
+
+            <Switch
+                android:id="@+id/domain_settings_block_all_third_party_requests_switch"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="14dp"
+                android:layout_marginBottom="14dp"
+                android:text="@string/block_all_third_party_requests"
                 android:textColor="?android:textColorPrimary"
                 android:textSize="18sp" />
         </LinearLayout>
@@ -352,8 +406,7 @@
                 <Spinner
                     android:id="@+id/domain_settings_user_agent_spinner"
                     android:layout_height="wrap_content"
-                    android:layout_width="match_parent"
-                    android:labelFor="@+id/domain_settings_custom_user_agent_edittext" />
+                    android:layout_width="match_parent" />
             </LinearLayout>
 
             <TextView
@@ -364,14 +417,17 @@
                 android:layout_marginEnd="36dp"
                 android:textSize="13sp" />
 
+            <!-- `android:autofillHints` only applies to API >= 26.  `tools:ignore="UnusedAttribute"` removes the lint warning. -->
             <EditText
-                android:id="@id/domain_settings_custom_user_agent_edittext"
+                android:id="@+id/domain_settings_custom_user_agent_edittext"
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
                 android:layout_marginStart="40dp"
                 android:layout_marginEnd="60dp"
                 android:inputType="textUri"
-                android:hint="@string/custom_user_agent"/>
+                android:hint="@string/custom_user_agent"
+                android:autofillHints=""
+                tools:ignore="UnusedAttribute" />
         </LinearLayout>
 
         <!-- Font Size. -->
@@ -619,7 +675,6 @@
 
                     <TextView
                         android:id="@+id/saved_ssl_certificate_issued_by_cname"
-
                         android:layout_height="wrap_content"
                         android:layout_width="match_parent" />