Merge "Add visibility control to ADB QR code preference." into rvc-dev am: f5ff928958

Change-Id: Iaa687cccc1c6c7667350e8de751d7010cd872cf5
This commit is contained in:
Joshua Duong
2020-03-20 19:16:42 +00:00
committed by Automerger Merge Worker
5 changed files with 238 additions and 54 deletions

View File

@@ -47,7 +47,8 @@
android:key="adb_pair_method_qrcode_pref"
android:icon="@drawable/ic_scan_24dp"
android:title="@string/adb_pair_method_qrcode_title"
android:summary="@string/adb_pair_method_qrcode_summary"/>
android:summary="@string/adb_pair_method_qrcode_summary"
settings:controller="com.android.settings.development.AdbQrCodePreferenceController"/>
<Preference
android:key="adb_pair_method_code_pref"
android:title="@string/adb_pair_method_code_title"