From 8b822858cfee30dc77ba2c24ac385283c5cfe502 Mon Sep 17 00:00:00 2001
From: "J. Eason" <easonj@google.com>
Date: Thu, 16 Sep 2021 14:59:53 +0000
Subject: [PATCH] Fix Wireless debugging icon alignment on developer options
 screen.

Added icon and dividers to realign and balance the screen layout.

Bug: 200139203
Test: atest SettingsUnitTests and manual
Change-Id: Ie5e89fd952f85bdf3fe0009b25ff127493e3cb95
(cherry picked from commit 4677bfbe253248f6a8d81b95a5644a289ff150eb)
---
 res/xml/adb_wireless_settings.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/res/xml/adb_wireless_settings.xml b/res/xml/adb_wireless_settings.xml
index 8a9cfe6d8cc..7d372070f37 100644
--- a/res/xml/adb_wireless_settings.xml
+++ b/res/xml/adb_wireless_settings.xml
@@ -42,7 +42,8 @@
     <!-- Pairing methods category -->
     <PreferenceCategory
         android:key="adb_pairing_methods_category"
-        android:layout="@layout/preference_category_no_label">
+        android:layout="@layout/preference_category_no_label"
+        settings:allowDividerAbove="true">
         <!-- qrcode scanner -->
         <Preference
             android:key="adb_pair_method_qrcode_pref"
@@ -52,6 +53,7 @@
             settings:controller="com.android.settings.development.AdbQrCodePreferenceController"/>
         <Preference
             android:key="adb_pair_method_code_pref"
+            android:icon="@drawable/ic_password"
             android:title="@string/adb_pair_method_code_title"
             android:summary="@string/adb_pair_method_code_summary"/>
     </PreferenceCategory>
@@ -59,7 +61,8 @@
     <!-- Paired devices list -->
     <PreferenceCategory
         android:key="adb_paired_devices_category"
-        android:title="@string/adb_paired_devices_title"/>
+        android:title="@string/adb_paired_devices_title"
+        settings:allowDividerAbove="true"/>
 
     <!-- Off message: Shown only in the off state -->
     <PreferenceCategory