[New Designs] Update Preferences to conform to new designs (#633)

Fixes ooni/probe#2593 ## Proposed Changes - Merge `Automated Testing` settings into whats left of `Test Options` |.|.| |-|-| | ![Screenshot_20231104_194231](https://github.com/ooni/probe-android/assets/17911892/9e926414-5fec-4181-a586-5e6dd4bc078e) | ![Screenshot_20231104_194243](https://github.com/ooni/probe-android/assets/17911892/fbdde7f8-d003-48bc-a33d-e72212a82cf2) |
ooni · Dec 14, 2023 · 755f943 · 755f943
1 parent 7b8ec93
commit 755f943
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 60 deletions.
diff --git a/app/src/fdroid/res/xml/preferences_global.xml b/app/src/fdroid/res/xml/preferences_global.xml
@@ -2,30 +2,27 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:key="@string/preferences"
 	android:title="@string/Settings_Title">
-<PreferenceScreen
-		android:icon="@drawable/automated_testing"
-		android:key="@string/automated_testing"
-		android:title="@string/Settings_AutomatedTesting_Label">
-		<SwitchPreferenceCompat
-			android:defaultValue="false"
-			android:key="@string/automated_testing_enabled"
-			android:title="@string/Settings_AutomatedTesting_RunAutomatically" />
-		<SwitchPreferenceCompat
-			android:defaultValue="true"
-			android:dependency="@string/automated_testing_enabled"
-			android:key="@string/automated_testing_wifionly"
-			android:title="@string/Settings_AutomatedTesting_RunAutomatically_WiFiOnly" />
-		<SwitchPreferenceCompat
-			android:defaultValue="true"
-			android:dependency="@string/automated_testing_enabled"
-			android:key="@string/automated_testing_charging"
-			android:title="@string/Settings_AutomatedTesting_RunAutomatically_ChargingOnly" />
-		<PreferenceCategory android:title="@string/Settings_AutomatedTesting_RunAutomatically_Footer" />
-	</PreferenceScreen>
 	<PreferenceScreen
 		android:icon="@drawable/test_options"
 		android:key="@string/test_options"
 		android:title="@string/Settings_TestOptions_Label">
+        <SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:key="@string/automated_testing_enabled"
+            android:title="@string/Settings_AutomatedTesting_RunAutomatically"
+            app:iconSpaceReserved="false" />
+        <SwitchPreferenceCompat
+            android:defaultValue="true"
+            android:dependency="@string/automated_testing_enabled"
+            android:key="@string/automated_testing_wifionly"
+            android:title="@string/Settings_AutomatedTesting_RunAutomatically_WiFiOnly"
+            app:iconSpaceReserved="false" />
+        <SwitchPreferenceCompat
+            android:defaultValue="true"
+            android:dependency="@string/automated_testing_enabled"
+            android:key="@string/automated_testing_charging"
+            android:title="@string/Settings_AutomatedTesting_RunAutomatically_ChargingOnly"
+            app:iconSpaceReserved="false" />
 		<PreferenceScreen
 			android:key="@string/Settings_Websites_Categories_Label"
 			android:title="@string/Settings_Websites_Categories_Label"
@@ -228,6 +225,9 @@
 			android:key="@string/max_runtime"
 			android:title="@string/Settings_Websites_MaxRuntime"
 			app:iconSpaceReserved="false" />
+        <PreferenceCategory
+            android:title="@string/Settings_AutomatedTesting_RunAutomatically_Footer"
+            app:iconSpaceReserved="false" />
 	</PreferenceScreen>
 	<PreferenceScreen
 		android:icon="@drawable/privacy"

diff --git a/app/src/main/java/org/openobservatory/ooniprobe/test/suite/MiddleBoxesSuite.java b/app/src/main/java/org/openobservatory/ooniprobe/test/suite/MiddleBoxesSuite.java
@@ -13,7 +13,8 @@
 import java.util.ArrayList;
 
 /**
- * @deprecated It is not possible to run a MiddleBoxesSuite anymore
+ * @deprecated
+ * It is not possible to run a MiddleBoxesSuite anymore
  * The HttpHeaderFieldManipulation and HttpInvalidRequestLine tests
  * are being ran inside the PerformanceSuite
  */

diff --git a/app/src/main/res/layout/fragment_content.xml b/app/src/main/res/layout/fragment_content.xml
@@ -1,22 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:orientation="vertical">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context=".fragment.PreferenceGlobalFragment">
 
-	<com.google.android.material.appbar.AppBarLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
 
-		<androidx.appcompat.widget.Toolbar
-			android:id="@+id/toolbar"
-			android:layout_width="match_parent"
-			android:layout_height="?attr/actionBarSize" />
-	</com.google.android.material.appbar.AppBarLayout>
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize" />
+    </com.google.android.material.appbar.AppBarLayout>
 
-	<FrameLayout
-		android:id="@+id/subContent"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent" />
-</LinearLayout>
+    <FrameLayout
+        android:id="@+id/subContent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</LinearLayout>
diff --git a/app/src/main/res/xml/preferences_global.xml b/app/src/main/res/xml/preferences_global.xml
@@ -14,31 +14,28 @@
 			android:title="@string/Modal_EnableNotifications_Paragraph"
 			app:iconSpaceReserved="false" />
 	</PreferenceScreen>
-	<PreferenceScreen
-		android:icon="@drawable/automated_testing"
-		android:key="@string/automated_testing"
-		android:title="@string/Settings_AutomatedTesting_Label">
-		<SwitchPreferenceCompat
-			android:defaultValue="false"
-			android:key="@string/automated_testing_enabled"
-			android:title="@string/Settings_AutomatedTesting_RunAutomatically" />
-		<SwitchPreferenceCompat
-			android:defaultValue="true"
-			android:dependency="@string/automated_testing_enabled"
-			android:key="@string/automated_testing_wifionly"
-			android:title="@string/Settings_AutomatedTesting_RunAutomatically_WiFiOnly" />
-		<SwitchPreferenceCompat
-			android:defaultValue="true"
-			android:dependency="@string/automated_testing_enabled"
-			android:key="@string/automated_testing_charging"
-			android:title="@string/Settings_AutomatedTesting_RunAutomatically_ChargingOnly" />
-		<PreferenceCategory android:title="@string/Settings_AutomatedTesting_RunAutomatically_Footer" />
-	</PreferenceScreen>
 	<PreferenceScreen
 		android:icon="@drawable/test_options"
 		android:key="@string/test_options"
 		android:title="@string/Settings_TestOptions_Label">
-		<PreferenceScreen
+        <SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:key="@string/automated_testing_enabled"
+            android:title="@string/Settings_AutomatedTesting_RunAutomatically"
+            app:iconSpaceReserved="false" />
+        <SwitchPreferenceCompat
+            android:defaultValue="true"
+            android:dependency="@string/automated_testing_enabled"
+            android:key="@string/automated_testing_wifionly"
+            android:title="@string/Settings_AutomatedTesting_RunAutomatically_WiFiOnly"
+            app:iconSpaceReserved="false" />
+        <SwitchPreferenceCompat
+            android:defaultValue="true"
+            android:dependency="@string/automated_testing_enabled"
+            android:key="@string/automated_testing_charging"
+            android:title="@string/Settings_AutomatedTesting_RunAutomatically_ChargingOnly"
+            app:iconSpaceReserved="false" />
+        <PreferenceScreen
 			android:key="@string/Settings_Websites_Categories_Label"
 			android:title="@string/Settings_Websites_Categories_Label"
 			app:iconSpaceReserved="false">
@@ -234,7 +231,10 @@
 			android:key="@string/max_runtime"
 			android:title="@string/Settings_Websites_MaxRuntime"
 			app:iconSpaceReserved="false" />
-	</PreferenceScreen>
+        <PreferenceCategory
+            android:title="@string/Settings_AutomatedTesting_RunAutomatically_Footer"
+            app:iconSpaceReserved="false" />
+    </PreferenceScreen>
 	<PreferenceScreen
 		android:icon="@drawable/privacy"
 		android:key="@string/privacy"