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

This commit is contained in:
TreeHugger Robot
2021-09-20 19:19:54 +00:00
committed by Android (Google) Code Review

View File

@@ -42,7 +42,8 @@
<!-- Pairing methods category --> <!-- Pairing methods category -->
<PreferenceCategory <PreferenceCategory
android:key="adb_pairing_methods_category" 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 --> <!-- qrcode scanner -->
<Preference <Preference
android:key="adb_pair_method_qrcode_pref" android:key="adb_pair_method_qrcode_pref"
@@ -52,6 +53,7 @@
settings:controller="com.android.settings.development.AdbQrCodePreferenceController"/> settings:controller="com.android.settings.development.AdbQrCodePreferenceController"/>
<Preference <Preference
android:key="adb_pair_method_code_pref" android:key="adb_pair_method_code_pref"
android:icon="@drawable/ic_password"
android:title="@string/adb_pair_method_code_title" android:title="@string/adb_pair_method_code_title"
android:summary="@string/adb_pair_method_code_summary"/> android:summary="@string/adb_pair_method_code_summary"/>
</PreferenceCategory> </PreferenceCategory>
@@ -59,7 +61,8 @@
<!-- Paired devices list --> <!-- Paired devices list -->
<PreferenceCategory <PreferenceCategory
android:key="adb_paired_devices_category" 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 --> <!-- Off message: Shown only in the off state -->
<PreferenceCategory <PreferenceCategory