Show process name next to port number in SettingsPortForwardingActivity
Bug: 382998551
Test: Run VmTerminalApp
Change-Id: Ie458f505e8d3c4d4f76063982927c7cfa1a86bba
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/SettingsPortForwardingActiveAdapter.kt b/android/TerminalApp/java/com/android/virtualization/terminal/SettingsPortForwardingActiveAdapter.kt
index 1bfa390..50e770b 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/SettingsPortForwardingActiveAdapter.kt
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/SettingsPortForwardingActiveAdapter.kt
@@ -15,6 +15,7 @@
*/
package com.android.virtualization.terminal
+import android.content.Context
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
@@ -22,8 +23,10 @@
import androidx.recyclerview.widget.RecyclerView
import com.google.android.material.materialswitch.MaterialSwitch
-class SettingsPortForwardingActiveAdapter(private val mPortsStateManager: PortsStateManager) :
- SettingsPortForwardingBaseAdapter<SettingsPortForwardingActiveAdapter.ViewHolder>() {
+class SettingsPortForwardingActiveAdapter(
+ private val mPortsStateManager: PortsStateManager,
+ private val mContext: Context,
+) : SettingsPortForwardingBaseAdapter<SettingsPortForwardingActiveAdapter.ViewHolder>() {
override fun getItems(): ArrayList<SettingsPortForwardingItem> {
val enabledPorts = mPortsStateManager.getEnabledPorts()
@@ -48,7 +51,12 @@
override fun onBindViewHolder(viewHolder: ViewHolder, position: Int) {
val port = mItems[position].port
- viewHolder.port.text = port.toString()
+ viewHolder.port.text =
+ mContext.getString(
+ R.string.settings_port_forwarding_active_ports_content,
+ port,
+ mPortsStateManager.getActivePortInfo(port)?.comm,
+ )
viewHolder.enabledSwitch.contentDescription = viewHolder.port.text
viewHolder.enabledSwitch.setOnCheckedChangeListener(null)
viewHolder.enabledSwitch.isChecked = mItems[position].enabled
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/SettingsPortForwardingActivity.kt b/android/TerminalApp/java/com/android/virtualization/terminal/SettingsPortForwardingActivity.kt
index b4ca77b..dffe279 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/SettingsPortForwardingActivity.kt
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/SettingsPortForwardingActivity.kt
@@ -42,7 +42,7 @@
mPortsStateManager = PortsStateManager.getInstance(this)
- mActivePortsAdapter = SettingsPortForwardingActiveAdapter(mPortsStateManager)
+ mActivePortsAdapter = SettingsPortForwardingActiveAdapter(mPortsStateManager, this)
val activeRecyclerView: RecyclerView =
findViewById(R.id.settings_port_forwarding_active_recycler_view)
activeRecyclerView.layoutManager = LinearLayoutManager(this)
diff --git a/android/TerminalApp/res/values/strings.xml b/android/TerminalApp/res/values/strings.xml
index 40c354e..10f1bea 100644
--- a/android/TerminalApp/res/values/strings.xml
+++ b/android/TerminalApp/res/values/strings.xml
@@ -87,6 +87,8 @@
<string name="settings_port_forwarding_sub_title">Allow/deny listening ports</string>
<!-- Title for active ports setting in port forwarding [CHAR LIMIT=none] -->
<string name="settings_port_forwarding_active_ports_title">Listening ports</string>
+ <!-- Text content for active ports setting in port forwarding [CHAR LIMIT=none] -->
+ <string name="settings_port_forwarding_active_ports_content"><xliff:g id="port_number" example="8000">%1$d</xliff:g> (<xliff:g id="process_name" example="undefined">%2$s</xliff:g>)</string>
<!-- Title for other enabled ports setting in port forwarding [CHAR LIMIT=none] -->
<string name="settings_port_forwarding_other_enabled_ports_title">Saved allowed ports</string>
<!-- Description of add button for other enabled ports. Used for talkback. [CHAR LIMIT=16] -->