From 1a109998433c2a2912ae70c64895915a71dfcefe Mon Sep 17 00:00:00 2001
From: John Trujillo <johnandrestrujillo@gmail.com>
Date: Fri, 18 Sep 2026 16:28:52 -0500
Subject: [PATCH 1/2] fix(ai-agents): draw the dropdown chevron and unify both
 panes [ADFA-6119]

Material 1.10 ignores app:endIconDrawable, so the chevron is set in code on the OpenAI preset and model fields. Gemini's Spinner becomes the same control and its pane moves onto the shared button, text and spacing styles.
---
 .../aiagentgemini/plugin/GeminiPlugin.kt      |   2 +-
 .../settings/GeminiSettingsFragment.kt        | 315 +++++++++---------
 .../src/main/res/drawable/ic_dropdown.xml     |  10 +
 .../res/layout/fragment_gemini_settings.xml   | 137 ++++++--
 .../src/main/res/layout/item_dropdown.xml     |  15 +
 .../src/main/res/values/dimens.xml            |  22 ++
 .../src/main/res/values/strings.xml           |  15 +-
 .../src/main/res/values/styles.xml            |  85 +++++
 .../aiagentopenai/plugin/OpenAiPlugin.kt      |   3 +
 .../settings/OpenAiSettingsFragment.kt        |  29 +-
 .../res/layout/fragment_openai_settings.xml   |   7 +-
 11 files changed, 460 insertions(+), 180 deletions(-)
 create mode 100644 plugins/AI-Agent-Gemini/src/main/res/drawable/ic_dropdown.xml
 create mode 100644 plugins/AI-Agent-Gemini/src/main/res/layout/item_dropdown.xml
 create mode 100644 plugins/AI-Agent-Gemini/src/main/res/values/dimens.xml

diff --git a/plugins/AI-Agent-Gemini/src/main/kotlin/com/itsaky/androidide/plugins/aiagentgemini/plugin/GeminiPlugin.kt b/plugins/AI-Agent-Gemini/src/main/kotlin/com/itsaky/androidide/plugins/aiagentgemini/plugin/GeminiPlugin.kt
index 391fd59e..dff4c643 100644
--- a/plugins/AI-Agent-Gemini/src/main/kotlin/com/itsaky/androidide/plugins/aiagentgemini/plugin/GeminiPlugin.kt
+++ b/plugins/AI-Agent-Gemini/src/main/kotlin/com/itsaky/androidide/plugins/aiagentgemini/plugin/GeminiPlugin.kt
@@ -277,7 +277,7 @@ class GeminiPlugin : IPlugin, DocumentationExtension {
                 does by embedding every chunk of the project with this model. It
                 is a separate setting because no Gemini model does both: this list
                 holds the models that advertise <code>embedContent</code>, and the
-                <b>Gemini Model</b> list above holds those that advertise
+                <b>Model</b> list above holds those that advertise
                 <code>generateContent</code>.</p>
                 <p>Changing it changes the vector space, so the project is indexed
                 again from scratch. Vectors from two different models are not
diff --git a/plugins/AI-Agent-Gemini/src/main/kotlin/com/itsaky/androidide/plugins/aiagentgemini/settings/GeminiSettingsFragment.kt b/plugins/AI-Agent-Gemini/src/main/kotlin/com/itsaky/androidide/plugins/aiagentgemini/settings/GeminiSettingsFragment.kt
index 24e0b8cc..f1368335 100644
--- a/plugins/AI-Agent-Gemini/src/main/kotlin/com/itsaky/androidide/plugins/aiagentgemini/settings/GeminiSettingsFragment.kt
+++ b/plugins/AI-Agent-Gemini/src/main/kotlin/com/itsaky/androidide/plugins/aiagentgemini/settings/GeminiSettingsFragment.kt
@@ -11,17 +11,18 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.WindowManager
-import android.widget.AdapterView
 import android.widget.ArrayAdapter
+import android.widget.AutoCompleteTextView
 import android.widget.Button
 import android.widget.EditText
+import android.widget.Filter
 import android.widget.LinearLayout
-import android.widget.Spinner
 import android.widget.TextView
 import android.widget.Toast
 import androidx.annotation.DrawableRes
-import androidx.fragment.app.Fragment
+import androidx.annotation.IdRes
 import androidx.annotation.StringRes
+import androidx.fragment.app.Fragment
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
@@ -38,7 +39,6 @@ import kotlinx.coroutines.launch
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
-import kotlin.math.roundToInt
 
 /**
  * This backend's settings pane, mounted by whichever screen offers a backend selector.
@@ -109,6 +109,9 @@ class GeminiSettingsFragment : Fragment() {
         )[GeminiSettingsViewModel::class.java]
 
         setupApiKeyUi(view)
+        setupModelPicker(view, chatModelPicker())
+        setupModelPicker(view, embeddingModelPicker())
+        setupModelRefresh(view)
     }
 
     override fun onResume() {
@@ -149,8 +152,9 @@ class GeminiSettingsFragment : Fragment() {
      * Long-press on [box]'s end icon shows [tag]'s tooltip.
      *
      * Separate from [wireTooltip] because the end icon is a clickable child that consumes the
-     * long-press before the box sees it — without this the reveal control would be the one
-     * contributed element with no tooltip of its own.
+     * long-press before the box sees it — without this every end icon on the pane, the reveal
+     * control and the dropdown chevrons alike, would be a contributed element with no tooltip of
+     * its own.
      */
     private fun wireEndIconTooltip(box: TextInputLayout, tag: String) {
         box.setEndIconOnLongClickListener { icon ->
@@ -163,6 +167,7 @@ class GeminiSettingsFragment : Fragment() {
     @SuppressLint("SetTextI18n")
     private fun setupApiKeyUi(view: View) {
         val apiKeyLayout = view.findViewById<LinearLayout>(R.id.gemini_api_key_layout)
+        val apiKeyLabel = view.findViewById<TextView>(R.id.gemini_api_key_label)
         val apiKeyBox = view.findViewById<TextInputLayout>(R.id.gemini_api_key_box)
         val apiKeyInput = view.findViewById<EditText>(R.id.gemini_api_key_input)
         val saveButton = view.findViewById<Button>(R.id.btn_save_api_key)
@@ -174,7 +179,7 @@ class GeminiSettingsFragment : Fragment() {
 
         // Not on apiKeyInput: long-press there is the paste menu, and a key is pasted.
         listOf<View>(
-            apiKeyBox, saveButton, editButton, clearButton, verificationText
+            apiKeyLabel, apiKeyBox, saveButton, editButton, clearButton, verificationText
         ).forEach { wireTooltip(it, GeminiPlugin.TOOLTIP_TAG_SETTINGS_GEMINI_KEY) }
         wireTooltip(getKeyButton, GeminiPlugin.TOOLTIP_TAG_SETTINGS_GET_KEY)
 
@@ -183,12 +188,6 @@ class GeminiSettingsFragment : Fragment() {
         // is otherwise unreachable.
         wireTooltip(statusTextView, GeminiPlugin.TOOLTIP_TAG_PLUGIN)
 
-        // Create the two model selection containers: chat first, embedding beneath it.
-        val chatPicker = chatModelPicker()
-        val embeddingPicker = embeddingModelPicker()
-        val chatModelContainer = createModelSelectionUi(view, chatPicker)
-        val embeddingModelContainer = createModelSelectionUi(view, embeddingPicker)
-
         /**
          * Show the outcome of (or progress of) the live key check.
          *
@@ -503,11 +502,6 @@ class GeminiSettingsFragment : Fragment() {
             updateUiState(isEditing = true)
             apiKeyInput.setText("")
         }
-
-        // Setup model selection
-        setupModelSelection(chatModelContainer, chatPicker)
-        setupModelSelection(embeddingModelContainer, embeddingPicker)
-        fetchModelsIfNeeded()
     }
 
     /**
@@ -587,29 +581,44 @@ class GeminiSettingsFragment : Fragment() {
     }
 
     /**
-     * Density-independent [dp] as whole pixels, for the views this pane builds in code. The
-     * `setPadding` family takes raw pixels, so a literal shrinks as screen density rises.
+     * Put the dropdown chevron on [box]'s end icon.
      *
-     * @param dp the density-independent size to convert
-     * @return the equivalent size in device pixels
+     * The drawable is set here rather than in the layout because Material 1.10 never reads
+     * `app:endIconDrawable`, so a custom end icon declared in XML draws blank — the same reason
+     * [SecretRevealController] sets the reveal icon in code. Without a visible chevron the field
+     * reads as a plain, read-only text box rather than a list to open.
      */
-    private fun dp(dp: Int): Int = (dp * resources.displayMetrics.density).roundToInt()
+    private fun setupDropdownEndIcon(box: TextInputLayout) {
+        // Already the mode declared in the layout; set again so the drawable below cannot be the
+        // one a later mode switch discards.
+        box.endIconMode = TextInputLayout.END_ICON_CUSTOM
+        box.setEndIconDrawable(R.drawable.ic_dropdown)
+        // Nothing ever moves the icon's checked state, so TalkBack would read "not checked" over
+        // a control that is not a toggle.
+        box.isEndIconCheckable = false
+    }
+
+    // --- Model pickers -------------------------------------------------------------------------
 
     /**
-     * Everything one model spinner needs, so the chat and embedding pickers are one implementation
-     * rather than two that drift.
+     * Everything one model dropdown needs, so the chat and embedding pickers are one
+     * implementation rather than two that drift.
      *
-     * @param tagPrefix namespaces this picker's view tags inside the shared container
-     * @param titleRes the section heading
-     * @param tooltipTag long-press help shared by the spinner and its Refresh button
+     * @param tooltipTag long-press help shared by the picker's label, field, hint and chevron
+     * @param helpHint hint shown while no catalog is offered
+     * @param liveHint hint shown once there is a list to tap
      * @param read the currently saved model
      * @param write persists a model the user picked
      * @param options the catalog to offer
      */
     private class ModelPicker(
-        val tagPrefix: String,
-        @StringRes val titleRes: Int,
+        @IdRes val boxId: Int,
+        @IdRes val inputId: Int,
+        @IdRes val labelId: Int,
+        @IdRes val hintId: Int,
         val tooltipTag: String,
+        @StringRes val helpHint: Int,
+        @StringRes val liveHint: Int,
         val read: () -> String,
         val write: (String) -> Unit,
         val options: LiveData<GeminiModelOptions>,
@@ -617,9 +626,13 @@ class GeminiSettingsFragment : Fragment() {
 
     /** The chat model: what a turn is generated with. */
     private fun chatModelPicker() = ModelPicker(
-        tagPrefix = "chat_model",
-        titleRes = R.string.label_gemini_model,
+        boxId = R.id.gemini_model_box,
+        inputId = R.id.gemini_model_input,
+        labelId = R.id.gemini_model_label,
+        hintId = R.id.gemini_model_hint_text,
         tooltipTag = GeminiPlugin.TOOLTIP_TAG_SETTINGS_GEMINI_MODEL,
+        helpHint = R.string.hint_gemini_model_help,
+        liveHint = R.string.hint_gemini_model_live,
         read = viewModel::getGeminiModel,
         write = viewModel::saveGeminiModel,
         options = viewModel.geminiModels,
@@ -627,109 +640,97 @@ class GeminiSettingsFragment : Fragment() {
 
     /** The embedding model: what semantic search indexes and queries with. */
     private fun embeddingModelPicker() = ModelPicker(
-        tagPrefix = "embedding_model",
-        titleRes = R.string.label_gemini_embedding_model,
+        boxId = R.id.gemini_embedding_model_box,
+        inputId = R.id.gemini_embedding_model_input,
+        labelId = R.id.gemini_embedding_model_label,
+        hintId = R.id.gemini_embedding_model_hint_text,
         tooltipTag = GeminiPlugin.TOOLTIP_TAG_SETTINGS_GEMINI_EMBEDDING_MODEL,
+        helpHint = R.string.hint_gemini_embedding_model_help,
+        liveHint = R.string.hint_gemini_embedding_model_live,
         read = viewModel::getGeminiEmbeddingModel,
         write = viewModel::saveGeminiEmbeddingModel,
         options = viewModel.geminiEmbeddingModels,
     )
 
     /**
-     * Builds one picker's views into [parent].
-     *
-     * Built in code rather than inflated because this pane's layout predates having two of them;
-     * the views are tagged, not given ids, so two pickers can share one container without a second
-     * set of resource ids.
+     * One model dropdown, built as the same control the OpenAI pane carries rather than a
+     * framework Spinner: one box, one chevron, one list.
      *
-     * @return the container holding this picker's views
+     * Pick-only — `keyListener = null` — because the catalog is whatever the key can reach, so
+     * unlike the OpenAI pane there is no free-text model to type. The field itself is what shows
+     * the model in use, which is why there is no separate "current model" line any more.
      */
-    private fun createModelSelectionUi(parent: View, picker: ModelPicker): LinearLayout {
-        val context = requireContext()
-        val container = LinearLayout(context).apply {
-            orientation = LinearLayout.VERTICAL
-            setPadding(0, dp(32), 0, 0)
-        }
-
-        val titleText = TextView(context).apply {
-            text = getString(picker.titleRes)
-            textSize = 16f
-            setPadding(0, 0, 0, dp(16))
-        }
-        container.addView(titleText)
-
-        val currentModelText = TextView(context).apply {
-            id = View.generateViewId()
-            text = getString(R.string.current_model, picker.read())
-            setPadding(0, 0, 0, dp(8))
-        }
-        container.addView(currentModelText)
-
-        val modelSpinner = Spinner(context).apply { id = View.generateViewId() }
-        container.addView(modelSpinner)
-
-        val refreshButton = Button(context).apply {
-            id = View.generateViewId()
-            text = getString(R.string.refresh_models)
-        }
-        container.addView(refreshButton)
-
-        if (parent is ViewGroup) {
-            parent.addView(container)
-        }
-
-        // Tag the views for later reference, namespaced so both pickers can share one parent.
-        container.tag = "${picker.tagPrefix}_container"
-        currentModelText.tag = "${picker.tagPrefix}_current_text"
-        modelSpinner.tag = "${picker.tagPrefix}_spinner"
-        refreshButton.tag = "${picker.tagPrefix}_refresh"
-
-        return container
-    }
-
-    @SuppressLint("ClickableViewAccessibility")
-    private fun setupModelSelection(container: View, picker: ModelPicker) {
-        val currentModelText =
-            container.findViewWithTag<TextView>("${picker.tagPrefix}_current_text")
-        val modelSpinner = container.findViewWithTag<Spinner>("${picker.tagPrefix}_spinner")
-        val refreshButton = container.findViewWithTag<Button>("${picker.tagPrefix}_refresh")
-
-        if (modelSpinner == null || refreshButton == null) return
-
-        wireTooltip(modelSpinner, picker.tooltipTag)
-        wireTooltip(refreshButton, picker.tooltipTag)
-
-        // Track real user taps so programmatic selection changes never persist a model.
-        var userTouchedSpinner = false
-
-        fun updateModelSpinner(models: List<String>, isLive: Boolean) {
-            val adapter = ArrayAdapter(
-                requireContext(),
-                android.R.layout.simple_spinner_item,
-                models
-            )
-            adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
-            modelSpinner.adapter = adapter
-
-            // Migrate off a retired saved model only for a live catalog, never for the fallback.
-            val currentModel = picker.read()
-            val currentIndex = models.indexOf(currentModel)
-            when {
-                currentIndex >= 0 -> modelSpinner.setSelection(currentIndex)
-                isLive && models.isNotEmpty() -> {
-                    modelSpinner.setSelection(0)
-                    val migrated = models[0]
-                    picker.write(migrated)
-                    currentModelText?.text = getString(R.string.current_model, migrated)
-                }
+    private fun setupModelPicker(view: View, picker: ModelPicker) {
+        val modelBox = view.findViewById<TextInputLayout>(picker.boxId)
+        val modelInput = view.findViewById<AutoCompleteTextView>(picker.inputId)
+        val modelLabel = view.findViewById<TextView>(picker.labelId)
+        val modelHint = view.findViewById<TextView>(picker.hintId)
+
+        setupDropdownEndIcon(modelBox)
+
+        listOf<View>(modelLabel, modelInput, modelHint)
+            .forEach { wireTooltip(it, picker.tooltipTag) }
+
+        // A picker, not a text field: the list is the only way to change it.
+        modelInput.keyListener = null
+        // The list is rebuilt from the catalog on every view creation, so there is nothing for the
+        // framework to restore — and its replayed setText() is a filtering one, which is what left
+        // the list holding only the selected entry after a day/night switch.
+        modelInput.isSaveEnabled = false
+        // The suppressing overload throughout: a filtering write would narrow the list.
+        modelInput.setText(picker.read(), false)
+
+        // Tapping anywhere in the field opens the list; the end icon is only a second way in.
+        modelInput.setOnClickListener { modelInput.showDropDown() }
+        modelBox.setEndIconOnClickListener { modelInput.showDropDown() }
+        wireEndIconTooltip(modelBox, picker.tooltipTag)
+        // Only a real pick reaches here, so unlike the Spinner this replaced there is no
+        // programmatic selection to tell apart from a user's.
+        modelInput.setOnItemClickListener { parent, _, position, _ ->
+            val selected = parent.getItemAtPosition(position) as? String
+            if (selected == null || selected == picker.read()) {
+                return@setOnItemClickListener
             }
+            picker.write(selected)
+            Toast.makeText(
+                requireContext(),
+                getString(R.string.model_changed, selected),
+                Toast.LENGTH_SHORT
+            ).show()
         }
 
         picker.options.observe(viewLifecycleOwner) { options ->
-            if (options.models.isNotEmpty()) {
-                updateModelSpinner(options.models, options.isLive)
+            // Cleared, not left stale: an empty list means there is no catalog to offer, and a
+            // remembered one would suggest models this key may no longer reach.
+            modelInput.setAdapter(
+                if (options.models.isEmpty()) {
+                    null
+                } else {
+                    DropdownAdapter(modelInput.context, options.models)
+                }
+            )
+            modelHint.setText(if (options.models.isEmpty()) picker.helpHint else picker.liveHint)
+
+            // Migrate off a retired saved model only for a live catalog, never for the fallback:
+            // the field has to show what will actually be requested.
+            if (!options.isLive || options.models.contains(picker.read())) {
+                return@observe
             }
+            val migrated = options.models.firstOrNull() ?: return@observe
+            picker.write(migrated)
+            modelInput.setText(migrated, false)
         }
+    }
+
+    /**
+     * The one Refresh button, shared by both pickers since one catalog walk answers them both.
+     *
+     * The initial fetch is guarded on the chat picker alone: the two are published together, so a
+     * non-empty chat list means the fetch has already happened.
+     */
+    private fun setupModelRefresh(view: View) {
+        val refreshButton = view.findViewById<Button>(R.id.btn_refresh_models)
+        wireTooltip(refreshButton, GeminiPlugin.TOOLTIP_TAG_SETTINGS_GEMINI_MODEL)
 
         viewModel.geminiModelsLoading.observe(viewLifecycleOwner) { isLoading ->
             refreshButton.isEnabled = !isLoading
@@ -737,43 +738,57 @@ class GeminiSettingsFragment : Fragment() {
                 if (isLoading) getString(R.string.loading) else getString(R.string.refresh_models)
         }
 
-        modelSpinner.setOnTouchListener { _, _ ->
-            userTouchedSpinner = true
-            false
+        refreshButton.setOnClickListener { viewModel.fetchGeminiModels() }
+
+        if (viewModel.geminiModels.value?.models.isNullOrEmpty()) {
+            viewModel.fetchGeminiModels()
         }
+    }
+}
 
-        modelSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-                // Ignore programmatic selections; only a real user pick persists the model.
-                if (!userTouchedSpinner) return
-                val selectedModel = parent?.getItemAtPosition(position) as? String
-                if (selectedModel != null && selectedModel != picker.read()) {
-                    picker.write(selectedModel)
-                    currentModelText?.text = getString(R.string.current_model, selectedModel)
-                    Toast.makeText(
-                        requireContext(),
-                        getString(R.string.model_changed, selectedModel),
-                        Toast.LENGTH_SHORT
-                    ).show()
-                }
+/**
+ * The model dropdown's rows and, more importantly, its filter.
+ *
+ * [ArrayAdapter]'s own filter narrows the list to whatever is already in the field, so after a
+ * day/night switch — which replays the field's text — the only row left to pick is the one already
+ * chosen. Substring matching over the full list is what a picker needs; identical to the OpenAI
+ * pane's adapter so the two can be lifted into `plugin-api` together.
+ */
+private class DropdownAdapter(
+    context: Context,
+    private val items: List<String>,
+) : ArrayAdapter<String>(context, R.layout.item_dropdown, items.toMutableList()) {
+
+    private val substringFilter = object : Filter() {
+        override fun performFiltering(constraint: CharSequence?): FilterResults {
+            val query = constraint?.toString()?.trim().orEmpty()
+            val matches = if (query.isEmpty()) {
+                items
+            } else {
+                items.filter { it.contains(query, ignoreCase = true) }
+            }
+            return FilterResults().apply {
+                values = matches
+                count = matches.size
             }
-
-            override fun onNothingSelected(parent: AdapterView<*>?) {}
         }
 
-        refreshButton.setOnClickListener { viewModel.fetchGeminiModels() }
+        @Suppress("UNCHECKED_CAST")
+        override fun publishResults(constraint: CharSequence?, results: FilterResults?) {
+            val rows = results?.values as? List<String> ?: items
+            clear()
+            addAll(rows)
+            notifyDataSetChanged()
+        }
     }
 
-    /**
-     * Fetches the catalog once for both pickers, since one walk answers them both.
-     *
-     * Guarded on the chat picker alone: the two are published together, so a non-empty chat list
-     * means the fetch has already happened.
-     */
-    private fun fetchModelsIfNeeded() {
-        if (viewModel.geminiModels.value?.models.isNullOrEmpty()) {
-            viewModel.fetchGeminiModels()
-        }
+    override fun getFilter(): Filter = substringFilter
+
+    override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
+        val view = super.getView(position, convertView, parent)
+        // Set on every bind rather than once: these rows are recycled.
+        (view as? TextView)?.setTextColor(context.getColor(R.color.plugin_on_surface))
+        return view
     }
 }
 
diff --git a/plugins/AI-Agent-Gemini/src/main/res/drawable/ic_dropdown.xml b/plugins/AI-Agent-Gemini/src/main/res/drawable/ic_dropdown.xml
new file mode 100644
index 00000000..8a9df932
--- /dev/null
+++ b/plugins/AI-Agent-Gemini/src/main/res/drawable/ic_dropdown.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M7,10l5,5 5,-5z" />
+</vector>
diff --git a/plugins/AI-Agent-Gemini/src/main/res/layout/fragment_gemini_settings.xml b/plugins/AI-Agent-Gemini/src/main/res/layout/fragment_gemini_settings.xml
index 333e638e..2eaa7bd4 100644
--- a/plugins/AI-Agent-Gemini/src/main/res/layout/fragment_gemini_settings.xml
+++ b/plugins/AI-Agent-Gemini/src/main/res/layout/fragment_gemini_settings.xml
@@ -1,16 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  Material fields and buttons throughout, on the shared house spacing scale, so this pane and the
+  OpenAI one read as the same screen with a different backend behind it. The root android:theme is
+  what guarantees the plugin's own button/input styles win over whatever theme the host builds the
+  inflation Context from.
+-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:theme="@style/ThemeOverlay.Plugin">
+
+    <!-- API key. Collapses to the status line once a key is stored. -->
 
     <TextView
         android:id="@+id/gemini_api_key_status_text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textColor="?android:attr/textColorSecondary"
+        android:layout_marginBottom="@dimen/space_sm"
+        android:textAppearance="@style/Plugin.Text.Body"
         android:visibility="gone" />
 
     <LinearLayout
@@ -20,11 +29,11 @@
         android:orientation="vertical">
 
         <TextView
+            android:id="@+id/gemini_api_key_label"
+            style="@style/Plugin.SectionHeader"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/label_gemini_api_key"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:paddingBottom="4dp"/>
+            android:text="@string/label_gemini_api_key" />
 
         <!--
           The reveal toggle is the box's own end icon rather than the loose ImageButton that used to
@@ -53,40 +62,40 @@
 
     <TextView
         android:id="@+id/gemini_key_verification_text"
+        style="@style/Plugin.StatusLine"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:drawablePadding="6dp"
-        android:gravity="center_vertical"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textColor="?android:attr/textColorSecondary"
+        android:layout_marginTop="@dimen/space_sm"
         android:visibility="gone" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
+        android:layout_marginTop="@dimen/space_md"
         android:orientation="horizontal">
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_clear_api_key"
+            style="@style/PluginButton.Filled"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/btn_clear_api_key"
             android:visibility="gone" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_edit_api_key"
+            style="@style/PluginButton.Filled"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
+            android:layout_marginStart="@dimen/space_sm"
             android:layout_weight="1"
             android:text="@string/btn_edit_api_key"
             android:visibility="gone" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_save_api_key"
+            style="@style/PluginButton.Filled"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -94,11 +103,101 @@
 
     </LinearLayout>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_get_free_key"
+        style="@style/PluginButton.Filled"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
+        android:layout_marginTop="@dimen/space_sm"
         android:text="@string/btn_get_free_key" />
 
+    <!-- Model. One dropdown, the same control the OpenAI pane uses: the catalog is whatever the
+         key can reach, so the list is the only way to change it. The chevron is not declared here —
+         Material 1.10 never reads app:endIconDrawable, so the icon a layout asks for draws blank;
+         setupDropdownEndIcon() sets it on every box in code. -->
+
+    <TextView
+        android:id="@+id/gemini_model_label"
+        style="@style/Plugin.SectionHeader"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/space_xl"
+        android:text="@string/label_gemini_model" />
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/gemini_model_box"
+        style="@style/PluginTextInputLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/hint_gemini_model"
+        app:endIconContentDescription="@string/cd_show_models"
+        app:endIconMode="custom">
+
+        <AutoCompleteTextView
+            android:id="@+id/gemini_model_input"
+            style="@style/PluginTextInputEditText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:completionThreshold="0"
+            android:inputType="none"
+            android:maxLines="1"
+            android:popupBackground="@color/plugin_surface" />
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <TextView
+        android:id="@+id/gemini_model_hint_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/space_xs"
+        android:text="@string/hint_gemini_model_help"
+        android:textAppearance="@style/Plugin.Text.Small" />
+
+    <!-- Embedding model. The other half of the same catalog: semantic search embeds with this one,
+         never with the chat model above. -->
+
+    <TextView
+        android:id="@+id/gemini_embedding_model_label"
+        style="@style/Plugin.SectionHeader"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/space_xl"
+        android:text="@string/label_gemini_embedding_model" />
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/gemini_embedding_model_box"
+        style="@style/PluginTextInputLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/hint_gemini_embedding_model"
+        app:endIconContentDescription="@string/cd_show_embedding_models"
+        app:endIconMode="custom">
+
+        <AutoCompleteTextView
+            android:id="@+id/gemini_embedding_model_input"
+            style="@style/PluginTextInputEditText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:completionThreshold="0"
+            android:inputType="none"
+            android:maxLines="1"
+            android:popupBackground="@color/plugin_surface" />
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <TextView
+        android:id="@+id/gemini_embedding_model_hint_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/space_xs"
+        android:text="@string/hint_gemini_embedding_model_help"
+        android:textAppearance="@style/Plugin.Text.Small" />
+
+    <!-- One Refresh for both pickers: a single catalog walk fills both lists. -->
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/btn_refresh_models"
+        style="@style/PluginButton.Filled"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/space_md"
+        android:text="@string/refresh_models" />
+
 </LinearLayout>
diff --git a/plugins/AI-Agent-Gemini/src/main/res/layout/item_dropdown.xml b/plugins/AI-Agent-Gemini/src/main/res/layout/item_dropdown.xml
new file mode 100644
index 00000000..ba750199
--- /dev/null
+++ b/plugins/AI-Agent-Gemini/src/main/res/layout/item_dropdown.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  One row of the model dropdown. The plugin's own item layout rather than
+  android.R.layout.simple_list_item_1, whose text color comes from the framework theme in effect
+  when the popup window is built — which is not reliably the one the pane is drawn in.
+-->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/selectableItemBackground"
+    android:gravity="center_vertical"
+    android:minHeight="@dimen/touch_target_min"
+    android:paddingHorizontal="@dimen/space_lg"
+    android:paddingVertical="@dimen/space_md"
+    android:textAppearance="@style/Plugin.Text.Body" />
diff --git a/plugins/AI-Agent-Gemini/src/main/res/values/dimens.xml b/plugins/AI-Agent-Gemini/src/main/res/values/dimens.xml
new file mode 100644
index 00000000..bce1ab1c
--- /dev/null
+++ b/plugins/AI-Agent-Gemini/src/main/res/values/dimens.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Spacing, radius and type scale shared with the other CoGo house plugins (see
+  client-time-tracker), so this pane sits on the same grid as the rest of the IDE's plugin UI
+  instead of the ad-hoc 4/8/24dp margins it used before.
+-->
+<resources>
+    <dimen name="space_xs">4dp</dimen>
+    <dimen name="space_sm">8dp</dimen>
+    <dimen name="space_md">12dp</dimen>
+    <dimen name="space_lg">16dp</dimen>
+    <dimen name="space_xl">24dp</dimen>
+
+    <dimen name="radius_md">8dp</dimen>
+    <dimen name="radius_lg">12dp</dimen>
+
+    <dimen name="text_micro">11sp</dimen>
+    <dimen name="text_small">13sp</dimen>
+    <dimen name="text_body">15sp</dimen>
+
+    <dimen name="touch_target_min">48dp</dimen>
+</resources>
diff --git a/plugins/AI-Agent-Gemini/src/main/res/values/strings.xml b/plugins/AI-Agent-Gemini/src/main/res/values/strings.xml
index 946a4d1a..ae625c5c 100644
--- a/plugins/AI-Agent-Gemini/src/main/res/values/strings.xml
+++ b/plugins/AI-Agent-Gemini/src/main/res/values/strings.xml
@@ -16,7 +16,7 @@
     <string name="gemini_error_failed_reason">The Gemini request failed. %1$s</string>
 
     <!-- Settings pane this backend contributes (see GeminiSettingsFragment) -->
-    <string name="label_gemini_api_key">Gemini API Key</string>
+    <string name="label_gemini_api_key">API Key</string>
     <string name="hint_gemini_api_key">Enter your Gemini API key</string>
     <!-- Reveal toggle on the masked credential field. Deliberately the same wording in
          every AI plugin: one control, one announcement, whatever the field holds. -->
@@ -51,9 +51,16 @@
     <string name="msg_key_hint_edit_first">Copied a new key? Tap Edit, then paste it into the field.</string>
     <string name="msg_no_browser_for_key">No browser available. The link was copied — open it on another device: %s</string>
     <string name="msg_key_link_copy_failed">Couldn\'t open a browser. Get your key at %s</string>
-    <string name="label_gemini_model">Gemini Model</string>
-    <string name="label_gemini_embedding_model">Gemini Embedding Model</string>
-    <string name="current_model">Current: %s</string>
+    <string name="label_gemini_model">Model</string>
+    <string name="hint_gemini_model">Gemini model</string>
+    <string name="cd_show_models">Show the model list</string>
+    <string name="hint_gemini_model_help">Refresh to list the models your key can reach.</string>
+    <string name="hint_gemini_model_live">Tap to pick from the models this key can reach.</string>
+    <string name="label_gemini_embedding_model">Embedding Model</string>
+    <string name="hint_gemini_embedding_model">Gemini embedding model</string>
+    <string name="cd_show_embedding_models">Show the embedding model list</string>
+    <string name="hint_gemini_embedding_model_help">Used by semantic search, never for chat. Refresh to list the embedding models your key can reach.</string>
+    <string name="hint_gemini_embedding_model_live">Tap to pick from the embedding models this key can reach.</string>
     <string name="refresh_models">Refresh Models</string>
     <string name="loading">Loading…</string>
     <string name="model_changed">Model changed to %s</string>
diff --git a/plugins/AI-Agent-Gemini/src/main/res/values/styles.xml b/plugins/AI-Agent-Gemini/src/main/res/values/styles.xml
index 1ba9a1f7..c86952f6 100644
--- a/plugins/AI-Agent-Gemini/src/main/res/values/styles.xml
+++ b/plugins/AI-Agent-Gemini/src/main/res/values/styles.xml
@@ -33,8 +33,85 @@
         <item name="colorOnError">@color/plugin_on_error</item>
         <item name="colorErrorContainer">@color/plugin_error_container</item>
         <item name="colorOnErrorContainer">@color/plugin_on_error_container</item>
+
+        <item name="materialButtonStyle">@style/PluginButton.Filled</item>
+        <item name="textInputStyle">@style/PluginTextInputLayout</item>
+    </style>
+
+    <!--
+      ThemeOverlay applied via android:theme on the settings pane's root. The host may build the
+      plugin's inflation Context by layering PluginTheme onto the *activity's* theme without
+      forcing it (PluginResourceContext), in which case PluginTheme's own items lose and the pane
+      falls back to framework widget defaults. android:theme on a ViewGroup wraps that subtree's
+      inflation Context, which is where MaterialButton and TextInputLayout look their styles up, so
+      this is what guarantees the pane is styled either way. No colors here: the widget styles pin
+      their own, so nothing depends on which theme won.
+    -->
+    <style name="ThemeOverlay.Plugin" parent="">
+        <item name="materialButtonStyle">@style/PluginButton.Filled</item>
+        <item name="textInputStyle">@style/PluginTextInputLayout</item>
+    </style>
+
+    <!-- Typography -->
+
+    <style name="Plugin.Text.Body" parent="TextAppearance.Material3.BodyMedium">
+        <item name="android:textColor">@color/plugin_on_surface</item>
+        <item name="android:textSize">@dimen/text_body</item>
+    </style>
+
+    <style name="Plugin.Text.Small" parent="TextAppearance.Material3.BodySmall">
+        <item name="android:textColor">@color/plugin_text_muted</item>
+        <item name="android:textSize">@dimen/text_small</item>
+        <item name="android:lineSpacingMultiplier">1.25</item>
     </style>
 
+    <!-- Eyebrow label above a field, as used by the IDE's own grouped settings. -->
+    <style name="Plugin.Text.Label" parent="TextAppearance.Material3.LabelMedium">
+        <item name="android:textColor">@color/plugin_text_muted</item>
+        <item name="android:textSize">@dimen/text_micro</item>
+        <item name="android:textAllCaps">true</item>
+        <item name="android:letterSpacing">0.08</item>
+        <item name="android:fontFamily">sans-serif-medium</item>
+    </style>
+
+    <!-- Explicit parent="" required: dot-name inference would look up @style/Plugin, which does
+         not exist, and break resource linking. -->
+    <style name="Plugin.SectionHeader" parent="">
+        <item name="android:textAppearance">@style/Plugin.Text.Label</item>
+        <item name="android:paddingBottom">@dimen/space_xs</item>
+    </style>
+
+    <!-- A status line under a field: one icon, one sentence, muted. -->
+    <style name="Plugin.StatusLine" parent="">
+        <item name="android:textAppearance">@style/Plugin.Text.Small</item>
+        <item name="android:drawablePadding">@dimen/space_sm</item>
+        <item name="android:gravity">center_vertical</item>
+    </style>
+
+    <!-- Buttons. Every color is a direct @color/* reference, never ?attr/*: the host may build the
+         plugin's inflation theme by layering PluginTheme onto the activity's own without forcing
+         it, and a Material 3 widget whose color roles resolve against that theme comes out as an
+         unreadable slab — dark-on-dark for an outlined button in light mode. The palette is neutral
+         by choice, matching the IDE's own grey accent rather than this plugin's orange, on a screen
+         whose chrome belongs to AI Core. Light/dark comes from values-night/colors.xml.
+
+         One style for every button on the pane: a secondary action that styled itself differently
+         is exactly what broke on the OpenAI pane, and the hierarchy is not worth a second way to
+         get contrast wrong. -->
+    <style name="PluginButton.Filled" parent="Widget.Material3.Button">
+        <item name="android:textAllCaps">false</item>
+        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:letterSpacing">0</item>
+        <item name="cornerRadius">@dimen/radius_md</item>
+        <item name="android:minHeight">@dimen/touch_target_min</item>
+        <item name="android:textColor">@color/plugin_on_secondary</item>
+        <item name="backgroundTint">@color/plugin_secondary</item>
+        <item name="iconTint">@color/plugin_on_secondary</item>
+        <item name="rippleColor">@color/plugin_ripple</item>
+    </style>
+
+    <!-- Inputs -->
+
     <!--
       The API key box, styled by an explicit style= on the widget rather than through the theme's
       textInputStyle: the host may build this plugin's inflation Context by layering PluginTheme
@@ -47,9 +124,17 @@
         <item name="hintTextColor">@color/plugin_text_muted</item>
         <item name="android:textColorHint">@color/plugin_text_muted</item>
         <item name="endIconTint">@color/plugin_on_surface_variant</item>
+        <item name="boxCornerRadiusTopStart">@dimen/radius_md</item>
+        <item name="boxCornerRadiusTopEnd">@dimen/radius_md</item>
+        <item name="boxCornerRadiusBottomStart">@dimen/radius_md</item>
+        <item name="boxCornerRadiusBottomEnd">@dimen/radius_md</item>
     </style>
 
+    <!-- The text inside every box. Applied explicitly because the model field is an
+         AutoCompleteTextView rather than a TextInputEditText, and so does not pick the box's own
+         text style up from the theme. -->
     <style name="PluginTextInputEditText" parent="Widget.Material3.TextInputEditText.OutlinedBox">
+        <item name="android:textAppearance">@style/Plugin.Text.Body</item>
         <item name="android:textColor">@color/plugin_on_surface</item>
     </style>
 
diff --git a/plugins/AI-Agent-OpenAI/src/main/kotlin/com/itsaky/androidide/plugins/aiagentopenai/plugin/OpenAiPlugin.kt b/plugins/AI-Agent-OpenAI/src/main/kotlin/com/itsaky/androidide/plugins/aiagentopenai/plugin/OpenAiPlugin.kt
index e17f0fe0..6fc0e457 100644
--- a/plugins/AI-Agent-OpenAI/src/main/kotlin/com/itsaky/androidide/plugins/aiagentopenai/plugin/OpenAiPlugin.kt
+++ b/plugins/AI-Agent-OpenAI/src/main/kotlin/com/itsaky/androidide/plugins/aiagentopenai/plugin/OpenAiPlugin.kt
@@ -202,6 +202,9 @@ class OpenAiPlugin : IPlugin, DocumentationExtension {
     override fun dispose() {
         context.logger.info("OpenAiPlugin: Disposing plugin")
 
+        // deactivate() removes this too; a dispose without one would leave the host holding this.
+        runCatching { context.removePluginLifecycleListener(aiCoreLifecycle) }
+
         releaseBackend()
         pluginContext = null
         context.logger.info("OpenAiPlugin: Released OpenAI backend")
diff --git a/plugins/AI-Agent-OpenAI/src/main/kotlin/com/itsaky/androidide/plugins/aiagentopenai/settings/OpenAiSettingsFragment.kt b/plugins/AI-Agent-OpenAI/src/main/kotlin/com/itsaky/androidide/plugins/aiagentopenai/settings/OpenAiSettingsFragment.kt
index 0d044904..fa5d089c 100644
--- a/plugins/AI-Agent-OpenAI/src/main/kotlin/com/itsaky/androidide/plugins/aiagentopenai/settings/OpenAiSettingsFragment.kt
+++ b/plugins/AI-Agent-OpenAI/src/main/kotlin/com/itsaky/androidide/plugins/aiagentopenai/settings/OpenAiSettingsFragment.kt
@@ -159,8 +159,9 @@ class OpenAiSettingsFragment : Fragment() {
      * Long-press on [box]'s end icon shows [tag]'s tooltip.
      *
      * Separate from [wireTooltip] because the end icon is a clickable child that consumes the
-     * long-press before the box sees it — without this the reveal control would be the one
-     * contributed element with no tooltip of its own.
+     * long-press before the box sees it — without this every end icon on the pane, the reveal
+     * control and the dropdown chevrons alike, would be a contributed element with no tooltip of
+     * its own.
      */
     private fun wireEndIconTooltip(box: TextInputLayout, tag: String) {
         box.setEndIconOnLongClickListener { icon ->
@@ -198,6 +199,24 @@ class OpenAiSettingsFragment : Fragment() {
         target.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, 0, 0)
     }
 
+    /**
+     * Put the dropdown chevron on [box]'s end icon.
+     *
+     * The drawable is set here rather than in the layout because Material 1.10 never reads
+     * `app:endIconDrawable`, so a custom end icon declared in XML draws blank — the same reason
+     * [SecretRevealController] sets the reveal icon in code. Without a visible chevron the field
+     * reads as a plain, read-only text box rather than a list to open.
+     */
+    private fun setupDropdownEndIcon(box: TextInputLayout) {
+        // Already the mode declared in the layout; set again so the drawable below cannot be the
+        // one a later mode switch discards.
+        box.endIconMode = TextInputLayout.END_ICON_CUSTOM
+        box.setEndIconDrawable(R.drawable.ic_dropdown)
+        // Nothing ever moves the icon's checked state, so TalkBack would read "not checked" over
+        // a control that is not a toggle.
+        box.isEndIconCheckable = false
+    }
+
     // --- Server -------------------------------------------------------------------------------
 
     private fun setupServerUi(view: View) {
@@ -208,6 +227,8 @@ class OpenAiSettingsFragment : Fragment() {
         val statusText = view.findViewById<TextView>(R.id.openai_server_status_text)
         val serverLabel = view.findViewById<TextView>(R.id.openai_server_label)
 
+        setupDropdownEndIcon(presetBox)
+
         listOf<View>(urlInput, saveButton, serverLabel, statusText)
             .forEach { wireTooltip(it, OpenAiPlugin.TOOLTIP_TAG_SETTINGS_SERVER) }
         wireTooltip(presetBox, OpenAiPlugin.TOOLTIP_TAG_SETTINGS_PRESET)
@@ -236,6 +257,7 @@ class OpenAiSettingsFragment : Fragment() {
         // Tapping anywhere in the field opens the list; the end icon is only a second way in.
         presetInput.setOnClickListener { presetInput.showDropDown() }
         presetBox.setEndIconOnClickListener { presetInput.showDropDown() }
+        wireEndIconTooltip(presetBox, OpenAiPlugin.TOOLTIP_TAG_SETTINGS_PRESET)
         presetInput.setOnItemClickListener { _, _, position, _ ->
             // A preset only fills the field; the user still has to save it.
             ServerPresets.ALL.getOrNull(position)?.url?.let { urlInput.setText(it) }
@@ -779,6 +801,8 @@ class OpenAiSettingsFragment : Fragment() {
         val modelLabel = view.findViewById<TextView>(picker.labelId)
         val modelHint = view.findViewById<TextView>(picker.hintId)
 
+        setupDropdownEndIcon(modelBox)
+
         listOf<View>(modelLabel, modelInput, modelHint)
             .forEach { wireTooltip(it, picker.tooltipTag) }
 
@@ -806,6 +830,7 @@ class OpenAiSettingsFragment : Fragment() {
         // Tapping the field opens the list; completionThreshold=0 alone waits for a keystroke.
         modelInput.setOnClickListener { modelInput.showDropDown() }
         modelBox.setEndIconOnClickListener { modelInput.showDropDown() }
+        wireEndIconTooltip(modelBox, picker.tooltipTag)
         modelInput.setOnItemClickListener { _, _, _, _ -> commitTypedModel() }
 
         // A server that does not offer the saved model retires it; the field must show what will
diff --git a/plugins/AI-Agent-OpenAI/src/main/res/layout/fragment_openai_settings.xml b/plugins/AI-Agent-OpenAI/src/main/res/layout/fragment_openai_settings.xml
index 2ed7c21d..d7ff6b24 100644
--- a/plugins/AI-Agent-OpenAI/src/main/res/layout/fragment_openai_settings.xml
+++ b/plugins/AI-Agent-OpenAI/src/main/res/layout/fragment_openai_settings.xml
@@ -22,7 +22,9 @@
         android:text="@string/label_openai_server" />
 
     <!-- The preset picker and the model picker are the same control on purpose: one tap opens a
-         list, and typing is still possible where it makes sense. -->
+         list, and typing is still possible where it makes sense. The chevron is not declared here:
+         Material 1.10 never reads app:endIconDrawable, so the icon a layout asks for draws blank —
+         setupDropdownEndIcon() sets it on every box in code. -->
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/openai_preset_box"
         style="@style/PluginTextInputLayout"
@@ -30,7 +32,6 @@
         android:layout_height="wrap_content"
         android:hint="@string/hint_openai_preset"
         app:endIconContentDescription="@string/cd_show_presets"
-        app:endIconDrawable="@drawable/ic_dropdown"
         app:endIconMode="custom">
 
         <AutoCompleteTextView
@@ -211,7 +212,6 @@
         android:layout_height="wrap_content"
         android:hint="@string/hint_openai_model"
         app:endIconContentDescription="@string/cd_show_models"
-        app:endIconDrawable="@drawable/ic_dropdown"
         app:endIconMode="custom">
 
         <AutoCompleteTextView
@@ -252,7 +252,6 @@
         android:layout_height="wrap_content"
         android:hint="@string/hint_openai_embedding_model"
         app:endIconContentDescription="@string/cd_show_embedding_models"
-        app:endIconDrawable="@drawable/ic_dropdown"
         app:endIconMode="custom">
 
         <AutoCompleteTextView

From 861df74a4aa0175050cba755239edd39b4d237fc Mon Sep 17 00:00:00 2001
From: John Trujillo <johnandrestrujillo@gmail.com>
Date: Fri, 25 Sep 2026 08:16:52 -0500
Subject: [PATCH 2/2] fix(ai-agents): address #106 review feedback [ADFA-6119]

Reword endIconDrawable comments, let pick-only model fields wrap, drop unused radius_lg.
---
 .../aiagentgemini/settings/GeminiSettingsFragment.kt       | 6 +++---
 .../plugins/aiagentgemini/ui/SecretRevealController.kt     | 4 ++--
 .../src/main/res/layout/fragment_gemini_settings.xml       | 7 ++-----
 plugins/AI-Agent-Gemini/src/main/res/values/dimens.xml     | 1 -
 .../plugins/aiagentmcp/ui/SecretRevealController.kt        | 4 ++--
 .../aiagentopenai/settings/OpenAiSettingsFragment.kt       | 6 +++---
 .../plugins/aiagentopenai/ui/SecretRevealController.kt     | 4 ++--
 .../src/main/res/layout/fragment_openai_settings.xml       | 7 +++----
 plugins/AI-Agent-OpenAI/src/main/res/values/dimens.xml     | 1 -
 9 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/plugins/AI-Agent-Gemini/src/main/kotlin/com/itsaky/androidide/plugins/aiagentgemini/settings/GeminiSettingsFragment.kt b/plugins/AI-Agent-Gemini/src/main/kotlin/com/itsaky/androidide/plugins/aiagentgemini/settings/GeminiSettingsFragment.kt
index f1368335..a7c7baca 100644
--- a/plugins/AI-Agent-Gemini/src/main/kotlin/com/itsaky/androidide/plugins/aiagentgemini/settings/GeminiSettingsFragment.kt
+++ b/plugins/AI-Agent-Gemini/src/main/kotlin/com/itsaky/androidide/plugins/aiagentgemini/settings/GeminiSettingsFragment.kt
@@ -583,9 +583,9 @@ class GeminiSettingsFragment : Fragment() {
     /**
      * Put the dropdown chevron on [box]'s end icon.
      *
-     * The drawable is set here rather than in the layout because Material 1.10 never reads
-     * `app:endIconDrawable`, so a custom end icon declared in XML draws blank — the same reason
-     * [SecretRevealController] sets the reveal icon in code. Without a visible chevron the field
+     * The drawable is set here rather than in the layout because an end icon declared as
+     * `app:endIconDrawable` draws blank inside the host — the same reason [SecretRevealController]
+     * sets the reveal icon in code. Without a visible chevron the field
      * reads as a plain, read-only text box rather than a list to open.
      */
     private fun setupDropdownEndIcon(box: TextInputLayout) {
diff --git a/plugins/AI-Agent-Gemini/src/main/kotlin/com/itsaky/androidide/plugins/aiagentgemini/ui/SecretRevealController.kt b/plugins/AI-Agent-Gemini/src/main/kotlin/com/itsaky/androidide/plugins/aiagentgemini/ui/SecretRevealController.kt
index 81d0d33c..ac8d5f63 100644
--- a/plugins/AI-Agent-Gemini/src/main/kotlin/com/itsaky/androidide/plugins/aiagentgemini/ui/SecretRevealController.kt
+++ b/plugins/AI-Agent-Gemini/src/main/kotlin/com/itsaky/androidide/plugins/aiagentgemini/ui/SecretRevealController.kt
@@ -37,8 +37,8 @@ internal class SecretRevealController(
     /**
      * Take over [box]'s end icon and mask the field.
      *
-     * The drawable is set here rather than in the layout because Material 1.10 never reads
-     * `app:endIconDrawable`, so a custom end icon declared in XML draws blank.
+     * The drawable is set here rather than in the layout because an end icon declared as
+     * `app:endIconDrawable` draws blank inside the host.
      */
     fun attach() {
         box.endIconMode = TextInputLayout.END_ICON_CUSTOM
diff --git a/plugins/AI-Agent-Gemini/src/main/res/layout/fragment_gemini_settings.xml b/plugins/AI-Agent-Gemini/src/main/res/layout/fragment_gemini_settings.xml
index 2eaa7bd4..688a4a51 100644
--- a/plugins/AI-Agent-Gemini/src/main/res/layout/fragment_gemini_settings.xml
+++ b/plugins/AI-Agent-Gemini/src/main/res/layout/fragment_gemini_settings.xml
@@ -40,8 +40,7 @@
           sit beside the field: the icon has a real touch target, and it is the same control the
           other AI plugins' credential fields carry. Nothing endIcon-related is declared here —
           SecretRevealController sets the mode, drawable, description and listener in code, because
-          Material 1.10 never reads app:endIconDrawable and a custom icon declared in XML draws
-          blank.
+          an end icon declared as app:endIconDrawable here draws blank inside the host.
         -->
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/gemini_api_key_box"
@@ -113,7 +112,7 @@
 
     <!-- Model. One dropdown, the same control the OpenAI pane uses: the catalog is whatever the
          key can reach, so the list is the only way to change it. The chevron is not declared here —
-         Material 1.10 never reads app:endIconDrawable, so the icon a layout asks for draws blank;
+         declared as app:endIconDrawable it draws blank inside the host, so
          setupDropdownEndIcon() sets it on every box in code. -->
 
     <TextView
@@ -140,7 +139,6 @@
             android:layout_height="wrap_content"
             android:completionThreshold="0"
             android:inputType="none"
-            android:maxLines="1"
             android:popupBackground="@color/plugin_surface" />
     </com.google.android.material.textfield.TextInputLayout>
 
@@ -179,7 +177,6 @@
             android:layout_height="wrap_content"
             android:completionThreshold="0"
             android:inputType="none"
-            android:maxLines="1"
             android:popupBackground="@color/plugin_surface" />
     </com.google.android.material.textfield.TextInputLayout>
 
diff --git a/plugins/AI-Agent-Gemini/src/main/res/values/dimens.xml b/plugins/AI-Agent-Gemini/src/main/res/values/dimens.xml
index bce1ab1c..8279555f 100644
--- a/plugins/AI-Agent-Gemini/src/main/res/values/dimens.xml
+++ b/plugins/AI-Agent-Gemini/src/main/res/values/dimens.xml
@@ -12,7 +12,6 @@
     <dimen name="space_xl">24dp</dimen>
 
     <dimen name="radius_md">8dp</dimen>
-    <dimen name="radius_lg">12dp</dimen>
 
     <dimen name="text_micro">11sp</dimen>
     <dimen name="text_small">13sp</dimen>
diff --git a/plugins/AI-Agent-MCP/src/main/kotlin/com/itsaky/androidide/plugins/aiagentmcp/ui/SecretRevealController.kt b/plugins/AI-Agent-MCP/src/main/kotlin/com/itsaky/androidide/plugins/aiagentmcp/ui/SecretRevealController.kt
index 3032f58a..098f08a9 100644
--- a/plugins/AI-Agent-MCP/src/main/kotlin/com/itsaky/androidide/plugins/aiagentmcp/ui/SecretRevealController.kt
+++ b/plugins/AI-Agent-MCP/src/main/kotlin/com/itsaky/androidide/plugins/aiagentmcp/ui/SecretRevealController.kt
@@ -37,8 +37,8 @@ internal class SecretRevealController(
     /**
      * Take over [box]'s end icon and mask the field.
      *
-     * The drawable is set here rather than in the layout because Material 1.10 never reads
-     * `app:endIconDrawable`, so a custom end icon declared in XML draws blank.
+     * The drawable is set here rather than in the layout because an end icon declared as
+     * `app:endIconDrawable` draws blank inside the host.
      */
     fun attach() {
         // The box exists only to carry the end icon: the dialog's other fields are plain EditTexts,
diff --git a/plugins/AI-Agent-OpenAI/src/main/kotlin/com/itsaky/androidide/plugins/aiagentopenai/settings/OpenAiSettingsFragment.kt b/plugins/AI-Agent-OpenAI/src/main/kotlin/com/itsaky/androidide/plugins/aiagentopenai/settings/OpenAiSettingsFragment.kt
index fa5d089c..4c82f89a 100644
--- a/plugins/AI-Agent-OpenAI/src/main/kotlin/com/itsaky/androidide/plugins/aiagentopenai/settings/OpenAiSettingsFragment.kt
+++ b/plugins/AI-Agent-OpenAI/src/main/kotlin/com/itsaky/androidide/plugins/aiagentopenai/settings/OpenAiSettingsFragment.kt
@@ -202,9 +202,9 @@ class OpenAiSettingsFragment : Fragment() {
     /**
      * Put the dropdown chevron on [box]'s end icon.
      *
-     * The drawable is set here rather than in the layout because Material 1.10 never reads
-     * `app:endIconDrawable`, so a custom end icon declared in XML draws blank — the same reason
-     * [SecretRevealController] sets the reveal icon in code. Without a visible chevron the field
+     * The drawable is set here rather than in the layout because an end icon declared as
+     * `app:endIconDrawable` draws blank inside the host — the same reason [SecretRevealController]
+     * sets the reveal icon in code. Without a visible chevron the field
      * reads as a plain, read-only text box rather than a list to open.
      */
     private fun setupDropdownEndIcon(box: TextInputLayout) {
diff --git a/plugins/AI-Agent-OpenAI/src/main/kotlin/com/itsaky/androidide/plugins/aiagentopenai/ui/SecretRevealController.kt b/plugins/AI-Agent-OpenAI/src/main/kotlin/com/itsaky/androidide/plugins/aiagentopenai/ui/SecretRevealController.kt
index 405d5d5a..227e9bf5 100644
--- a/plugins/AI-Agent-OpenAI/src/main/kotlin/com/itsaky/androidide/plugins/aiagentopenai/ui/SecretRevealController.kt
+++ b/plugins/AI-Agent-OpenAI/src/main/kotlin/com/itsaky/androidide/plugins/aiagentopenai/ui/SecretRevealController.kt
@@ -37,8 +37,8 @@ internal class SecretRevealController(
     /**
      * Take over [box]'s end icon and mask the field.
      *
-     * The drawable is set here rather than in the layout because Material 1.10 never reads
-     * `app:endIconDrawable`, so a custom end icon declared in XML draws blank.
+     * The drawable is set here rather than in the layout because an end icon declared as
+     * `app:endIconDrawable` draws blank inside the host.
      */
     fun attach() {
         box.endIconMode = TextInputLayout.END_ICON_CUSTOM
diff --git a/plugins/AI-Agent-OpenAI/src/main/res/layout/fragment_openai_settings.xml b/plugins/AI-Agent-OpenAI/src/main/res/layout/fragment_openai_settings.xml
index d7ff6b24..17dd2819 100644
--- a/plugins/AI-Agent-OpenAI/src/main/res/layout/fragment_openai_settings.xml
+++ b/plugins/AI-Agent-OpenAI/src/main/res/layout/fragment_openai_settings.xml
@@ -23,7 +23,7 @@
 
     <!-- The preset picker and the model picker are the same control on purpose: one tap opens a
          list, and typing is still possible where it makes sense. The chevron is not declared here:
-         Material 1.10 never reads app:endIconDrawable, so the icon a layout asks for draws blank —
+         declared as app:endIconDrawable it draws blank inside the host, so
          setupDropdownEndIcon() sets it on every box in code. -->
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/openai_preset_box"
@@ -41,7 +41,6 @@
             android:layout_height="wrap_content"
             android:completionThreshold="0"
             android:inputType="none"
-            android:maxLines="1"
             android:popupBackground="@color/plugin_surface" />
     </com.google.android.material.textfield.TextInputLayout>
 
@@ -122,8 +121,8 @@
                  gets a real touch target, and the fragment still owns the click so the window can
                  be flagged secure while the key is legible. Nothing endIcon-related is declared
                  here — SecretRevealController sets the mode, drawable, description and listener in
-                 code, because Material 1.10 never reads app:endIconDrawable and the icon a layout
-                 asks for draws blank. -->
+                 code, because an end icon declared as app:endIconDrawable here draws blank inside
+                 the host. -->
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/openai_api_key_box"
                 style="@style/PluginTextInputLayout"
diff --git a/plugins/AI-Agent-OpenAI/src/main/res/values/dimens.xml b/plugins/AI-Agent-OpenAI/src/main/res/values/dimens.xml
index bce1ab1c..8279555f 100644
--- a/plugins/AI-Agent-OpenAI/src/main/res/values/dimens.xml
+++ b/plugins/AI-Agent-OpenAI/src/main/res/values/dimens.xml
@@ -12,7 +12,6 @@
     <dimen name="space_xl">24dp</dimen>
 
     <dimen name="radius_md">8dp</dimen>
-    <dimen name="radius_lg">12dp</dimen>
 
     <dimen name="text_micro">11sp</dimen>
     <dimen name="text_small">13sp</dimen>