From 63b4c1ab85516685427560913211be41d0e998c9 Mon Sep 17 00:00:00 2001
From: Arc Wang <arcwang@google.com>
Date: Mon, 8 Apr 2019 19:56:45 +0800
Subject: [PATCH] Remove the PreferenceGroup without title in
 WifiNetworkDetailsFragment

To remove the PreferenceGroup title space.

Bug: 129683066
Test: manual
Change-Id: I00bced8038a01c0ef7e8f4dfa0b82e36a275004e
---
 res/xml/wifi_network_details_fragment.xml     | 72 +++++++++----------
 .../AddDevicePreferenceController.java        |  3 +-
 2 files changed, 35 insertions(+), 40 deletions(-)

diff --git a/res/xml/wifi_network_details_fragment.xml b/res/xml/wifi_network_details_fragment.xml
index 8fb19cbc684..3218e0de25e 100644
--- a/res/xml/wifi_network_details_fragment.xml
+++ b/res/xml/wifi_network_details_fragment.xml
@@ -36,49 +36,45 @@
         android:key="buttons"
         android:selectable="false" />
 
-    <!-- General Details Category -->
-    <PreferenceCategory
-            android:key="general_details_category" >
-        <Preference
-                android:key="signal_strength"
-                android:title="@string/wifi_signal"
-                android:selectable="false"/>
+    <!-- General Details Preferences -->
+    <Preference
+        android:key="signal_strength"
+        android:title="@string/wifi_signal"
+        android:selectable="false"
+        settings:allowDividerAbove="true"/>
 
-        <Preference
-                android:key="frequency"
-                android:icon="@drawable/ic_frequency_antenna"
-                android:title="@string/wifi_frequency"
-                android:selectable="false"/>
+    <Preference
+        android:key="frequency"
+        android:icon="@drawable/ic_frequency_antenna"
+        android:title="@string/wifi_frequency"
+        android:selectable="false"/>
 
-        <Preference
-                android:key="security"
-                android:icon="@drawable/ic_security_lock_24dp"
-                android:title="@string/wifi_security"
-                android:selectable="false"/>
+    <Preference
+        android:key="security"
+        android:icon="@drawable/ic_security_lock_24dp"
+        android:title="@string/wifi_security"
+        android:selectable="false"/>
 
-        <DropDownPreference
-                android:key="metered"
-                android:icon="@drawable/ic_attach_money_black_24dp"
-                android:title="@string/data_usage_metered_yes"
-                android:entries="@array/wifi_metered_entries"
-                android:entryValues="@array/wifi_metered_values"/>
+    <DropDownPreference
+        android:key="metered"
+        android:icon="@drawable/ic_attach_money_black_24dp"
+        android:title="@string/data_usage_metered_yes"
+        android:entries="@array/wifi_metered_entries"
+        android:entryValues="@array/wifi_metered_values"/>
 
-        <DropDownPreference
-            android:key="privacy"
-            android:icon="@drawable/ic_wifi_privacy_24dp"
-            android:title="@string/wifi_privacy_settings"
-            android:entries="@array/wifi_privacy_entries"
-            android:entryValues="@array/wifi_privacy_values"/>
-    </PreferenceCategory>
+    <DropDownPreference
+        android:key="privacy"
+        android:icon="@drawable/ic_wifi_privacy_24dp"
+        android:title="@string/wifi_privacy_settings"
+        android:entries="@array/wifi_privacy_entries"
+        android:entryValues="@array/wifi_privacy_values"/>
 
-    <!-- Add device Category -->
-    <PreferenceCategory
-            android:key="add_device_category" >
-        <Preference
-                android:key="add_device_to_network"
-                android:title="@string/wifi_dpp_add_device"
-                android:summary="@string/wifi_dpp_connect_network_using_qr_code"/>
-    </PreferenceCategory>
+    <!-- Add device Preference -->
+    <Preference
+        android:key="add_device_to_network"
+        android:title="@string/wifi_dpp_add_device"
+        android:summary="@string/wifi_dpp_connect_network_using_qr_code"
+        settings:allowDividerAbove="true"/>
 
     <!-- Network Details -->
     <PreferenceCategory
diff --git a/src/com/android/settings/wifi/details/AddDevicePreferenceController.java b/src/com/android/settings/wifi/details/AddDevicePreferenceController.java
index 61804a284dd..eb7e2269c5c 100644
--- a/src/com/android/settings/wifi/details/AddDevicePreferenceController.java
+++ b/src/com/android/settings/wifi/details/AddDevicePreferenceController.java
@@ -35,14 +35,13 @@ public class AddDevicePreferenceController extends BasePreferenceController {
 
     private static final String TAG = "AddDevicePreferenceController";
 
-    private static final String KEY_ADD_DEVICE_CATEGORY = "add_device_category";
     private static final String KEY_ADD_DEVICE = "add_device_to_network";
 
     private AccessPoint mAccessPoint;
     private WifiManager mWifiManager;
 
     public AddDevicePreferenceController(Context context) {
-        super(context, KEY_ADD_DEVICE_CATEGORY);
+        super(context, KEY_ADD_DEVICE);
 
         mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
     }