Improve instructions for Wireless Debugging

Signed-off-by: Muntashir Al-Islam <muntashirakon@riseup.net>

Author: MuntashirAkon

app/src/main/java/io/github/muntashirakon/AppManager/settings/Ops.java

@@ -423,17 +423,18 @@ private static void autoDetectRootSystemOrAdbAndPersist(@NonNull Context context
     public static void connectWirelessDebugging(@NonNull FragmentActivity activity,
                                                 @NonNull AdbConnectionInterface callback) {
         DialogTitleBuilder builder = new DialogTitleBuilder(activity)
-                .setTitle(R.string.wireless_debugging)
+                .setTitle(R.string.manual_wireless_debugging_title)
                 .setEndIcon(R.drawable.ic_open_in_new, v -> {
                     Intent intent = new Intent(android.provider.Settings.ACTION_APPLICATION_DEVELOPMENT_SETTINGS)
+                            .putExtra(":settings:fragment_args_key", "toggle_adb_wireless")
                             .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                     activity.startActivity(intent);
                 })
                 .setEndIconContentDescription(R.string.open_developer_options_page);
 
         new MaterialAlertDialogBuilder(activity)
                 .setCustomTitle(builder.build())
-                .setMessage(R.string.choose_what_to_do)
+                .setMessage(R.string.manual_wireless_debugging_instructions)
                 .setCancelable(false)
                 .setPositiveButton(R.string.adb_connect, (dialog1, which1) -> callback.onStatusReceived(STATUS_ADB_CONNECT_REQUIRED))
                 .setNeutralButton(R.string.adb_pair, (dialog1, which1) -> callback.onStatusReceived(STATUS_ADB_PAIRING_REQUIRED))
@@ -525,7 +526,7 @@ public static void connectAdbInput(@NonNull FragmentActivity activity,
     public static void pairAdbInput(@NonNull FragmentActivity activity,
                                     @NonNull AdbConnectionInterface callback) {
         new MaterialAlertDialogBuilder(activity)
-                .setTitle(R.string.wireless_debugging)
+                .setTitle(R.string.adb_pairing_title)
                 .setMessage(R.string.adb_pairing_instruction)
                 .setCancelable(false)
                 .setNeutralButton(R.string.action_manual, (dialog, which) -> {
@@ -537,6 +538,7 @@ public static void pairAdbInput(@NonNull FragmentActivity activity,
                 .setNegativeButton(R.string.cancel, (dialog, which) -> callback.onStatusReceived(STATUS_FAILURE))
                 .setPositiveButton(R.string.go, (dialog, which) -> {
                     Intent developerOptionsIntent = new Intent(Settings.ACTION_APPLICATION_DEVELOPMENT_SETTINGS)
+                            .putExtra(":settings:fragment_args_key", "toggle_adb_wireless")
                             .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                     Intent adbPairingServiceIntent = new Intent(activity, AdbPairingService.class)
                             .setAction(AdbPairingService.ACTION_START_PAIRING);

app/src/main/res/values/strings.xml

@@ -1466,7 +1466,7 @@
     <string name="status_connecting_via_mode">Connecting via %s</string>
     <string name="status_connected_via_mode">Connected via %s</string>
     <string name="status_not_connected_via_mode">Could not connect via %s</string>
-    <string name="adb_pairing_instruction">Please navigate to the developer options to enable wireless debugging and generate a pairing code. Click <b>Manual</b> if you\'ve already opened the developer options.</string>
+    <string name="adb_pairing_instruction">Please navigate to the developer options to enable wireless debugging and generate a pairing code. Once a pairing code is generated, enter it in the popup notification to complete pairing.\n\nClick <b>Manual</b> if you\'ve already opened the developer options.</string>
     <string name="adb_pairing_searching_for_port">Searching…</string>
     <string name="adb_pairing_stop_searching">Stop</string>
     <string name="adb_pairing_input_pairing_code">Pairing code</string>
@@ -1554,4 +1554,7 @@
     <string name="selected_items_accessibility_description">Selected %d out of %d items</string>
     <string name="adb_local_server_port">ADB local server port</string>
     <string name="waiting_for_wifi">Waiting for Wi-Fi</string>
+    <string name="adb_pairing_title">Pair App Manager using Wi-Fi</string>
+    <string name="manual_wireless_debugging_instructions">App Manager was unable to connect automatically using wireless debugging. Click <b>Pair</b> if you haven\'t paired App Manager using Wi-Fi or if the authorization was revoked. Otherwise click <b>Connect</b> to manually enter the port number. You can also use the button at the top to navigate to the wireless debugging setting.</string>
+    <string name="manual_wireless_debugging_title">Connect using Wireless Debugging</string>
 </resources>