Merge "Fix Wireless debugging icon alignment on developer options screen." into sc-qpr1-dev am: 9dbe775faa

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15845730

Change-Id: I211127b96a7f675dcf7b907d261a19d1311b33ea
This commit is contained in:
TreeHugger Robot
2021-09-20 19:41:51 +00:00
committed by Automerger Merge Worker

View File

@@ -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