Tweak the user-only connection status UI to make it clearer

Author: pimterry

app/src/main/res/layout/connection_status_user.xml

@@ -14,6 +14,18 @@
             android:text=""
             android:layout_marginBottom="24sp" />
 
+    <com.google.android.material.card.MaterialCardView
+            style="@style/ConnectionStatusCard"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+        <TextView
+                style="@style/ConnectionStatusHeading"
+                android:drawableStart="@drawable/ic_check_circle"
+                android:text="@string/user_connection_status_enabled_heading" />
+
+    </com.google.android.material.card.MaterialCardView>
+
     <com.google.android.material.card.MaterialCardView
             style="@style/ConnectionStatusCard"
             android:layout_width="match_parent"
@@ -26,27 +38,15 @@
 
             <TextView
                     style="@style/ConnectionStatusHeading"
-                    android:drawableStart="@drawable/ic_check_circle"
-                    android:text="@string/user_connection_status_enabled_heading" />
+                    android:drawableStart="@drawable/ic_exclamation_triangle"
+                    android:text="@string/system_connection_status_disabled_heading" />
 
             <TextView
                     style="@style/ConnectionStatusText"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/user_connection_status_details" />
         </LinearLayout>
-
-    </com.google.android.material.card.MaterialCardView>
-
-    <com.google.android.material.card.MaterialCardView
-            style="@style/ConnectionStatusCard"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-        <TextView
-                style="@style/ConnectionStatusHeading"
-                android:drawableStart="@drawable/ic_exclamation_triangle"
-                android:text="@string/system_connection_status_disabled_heading" />
     </com.google.android.material.card.MaterialCardView>
 
 </android.widget.LinearLayout>

app/src/main/res/values/strings.xml

@@ -36,7 +36,7 @@
     </string>
 
     <string name="user_connection_status_details">
-        HTTPS traffic may not be intercepted from all apps, unless they are configured to trust user-installed certificates.
+        HTTPS traffic will only be intercepted from apps that are configured to trust user-installed certificates.
     </string>
     <string name="system_connection_status_details">
         Traffic will be intercepted from all installed applications, except those using explicit certificate pinning.