Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 949b3499 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix Wireless debugging icon alignment on developer options screen."... 

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

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

Change-Id: Ie8392b9c08592411b5a7279459adb56da1698225
parents e8600994 9dbe775f

res/xml/adb_wireless_settings.xml

+5 −2
Original line number Diff line number Diff line
@@ -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