X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fdomain_settings.xml;h=cdda48e8af5fc4d12f122f9464685cb42c590c41;hb=0ef5e9e86c340e134f78f072b2449bb29179ec28;hp=7485ef0063878a10972fd525d0f8b3bccc241ae7;hpb=557c44e588c9c881a5a1573667a34d0355cde834;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/layout/domain_settings.xml b/app/src/main/res/layout/domain_settings.xml
index 7485ef00..cdda48e8 100644
--- a/app/src/main/res/layout/domain_settings.xml
+++ b/app/src/main/res/layout/domain_settings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright 2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
@@ -40,7 +40,7 @@
         <LinearLayout
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:orientation="vertical">
+            android:orientation="vertical" >
 
             <LinearLayout
                 android:layout_height="wrap_content"
@@ -94,7 +94,6 @@
                 android:layout_width="wrap_content"
                 android:layout_marginEnd="10dp"
                 android:layout_gravity="center_vertical"
-                android:src="@drawable/privacy_mode"
                 tools:ignore="contentDescription" />
 
             <Switch
@@ -121,7 +120,6 @@
                 android:layout_marginTop="1dp"
                 android:layout_marginEnd="10dp"
                 android:layout_gravity="center_vertical"
-                android:src="@drawable/cookies_disabled"
                 tools:ignore="contentDescription" />
 
             <Switch
@@ -149,7 +147,6 @@
                 android:layout_marginTop="1dp"
                 android:layout_marginEnd="10dp"
                 android:layout_gravity="center_vertical"
-                android:src="@drawable/cookies_disabled"
                 tools:ignore="contentDescription" />
 
             <Switch
@@ -176,7 +173,6 @@
                 android:layout_marginTop="1dp"
                 android:layout_marginEnd="10dp"
                 android:layout_gravity="center_vertical"
-                android:src="@drawable/dom_storage_disabled"
                 tools:ignore="contentDescription" />
 
             <Switch
@@ -194,7 +190,7 @@
         <LinearLayout
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:orientation="horizontal">
+            android:orientation="horizontal" >
 
             <ImageView
                 android:id="@+id/domain_settings_form_data_imageview"
@@ -203,7 +199,6 @@
                 android:layout_marginTop="1dp"
                 android:layout_marginEnd="10dp"
                 android:layout_gravity="center_vertical"
-                android:src="@drawable/form_data_disabled"
                 tools:ignore="contentDescription" />
 
             <Switch
@@ -228,7 +223,7 @@
             <LinearLayout
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
-                android:orientation="horizontal">
+                android:orientation="horizontal" >
 
                 <ImageView
                     android:layout_height="wrap_content"
@@ -237,14 +232,13 @@
                     android:layout_marginEnd="10dp"
                     android:layout_gravity="center_vertical"
                     android:src="@drawable/user_agent"
-                    android:tint="@color/blue_800"
                     android:contentDescription="@string/user_agent" />
 
                 <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:labelFor="@+id/domain_settings_custom_user_agent_edittext" />
             </LinearLayout>
 
             <TextView
@@ -253,7 +247,7 @@
                 android:layout_width="match_parent"
                 android:layout_marginStart="43dp"
                 android:layout_marginEnd="36dp"
-                android:textSize="13sp"/>
+                android:textSize="13sp" />
 
             <EditText
                 android:id="@id/domain_settings_custom_user_agent_edittext"
@@ -265,12 +259,10 @@
         </LinearLayout>
 
         <!-- Font Size. -->
-        <!-- We need to add an extra `android:layout_marginBottom="14dp"` to the last `LinearLayout` or the bottom of the `ScrollView` gets cutoff if API 25. -->
         <LinearLayout
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:orientation="horizontal"
-            android:layout_marginBottom="14dp" >
+            android:orientation="horizontal" >
 
             <ImageView
                 android:layout_height="wrap_content"
@@ -279,7 +271,6 @@
                 android:layout_marginEnd="10dp"
                 android:layout_gravity="center_vertical"
                 android:src="@drawable/font_size"
-                android:tint="@color/blue_800"
                 android:contentDescription="@string/font_size" />
 
             <Spinner
@@ -287,7 +278,30 @@
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
                 android:layout_marginTop="14dp"
-                android:layout_marginBottom="14dp"/>
+                android:layout_marginBottom="14dp" />
+        </LinearLayout>
+
+        <!-- Display Images. -->
+        <LinearLayout
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:orientation="horizontal" >
+
+            <ImageView
+                android:id="@+id/domain_settings_display_webpage_images_imageview"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:layout_marginTop="1dp"
+                android:layout_marginEnd="10dp"
+                android:layout_gravity="center_vertical"
+                android:contentDescription="@string/display_webpage_images" />
+
+            <Spinner
+                android:id="@+id/domain_settings_display_webpage_images_spinner"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_marginTop="14dp"
+                android:layout_marginBottom="14dp" />
         </LinearLayout>
     </LinearLayout>
 </ScrollView>
\ No newline at end of file