From 8ae2b6da463f18132b0c37893e3059f46f064985 Mon Sep 17 00:00:00 2001
From: David Tseng <dtseng@google.com>
Date: Tue, 25 Nov 2025 10:21:08 -0800
Subject: [PATCH 1/3] [core-aam]: add Android TBD entries

---
 core-aam/index.html | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/core-aam/index.html b/core-aam/index.html
index 33dc2ab4d..a12bf725b 100644
--- a/core-aam/index.html
+++ b/core-aam/index.html
@@ -12058,6 +12058,12 @@ <h3>Changes to document content or node visibility</h3>
                 <td><code>text_changed::delete</code> and <code>text_changed::insert</code></td>
                 <td>If in a <a class="termref">live region</a>, <code>AXLiveRegionChanged</code>.<br />If in <code>aria-errormessage</code>, <code>AXValidationErrorChanged</code>.</td>
               </tr>
+              <tr>
+                <th>Android</th>
+                <td>
+                  <p>TBD</p>
+                </td>
+              </tr>
             </tbody>
           </table>
           <p>
@@ -12147,6 +12153,12 @@ <h3>Changes to document content or node visibility</h3>
                   <p>If in a live region, <code>AXLiveRegionChanged</code></p>
                 </td>
               </tr>
+              <tr>
+                <th>Android</th>
+                <td>
+                  <p>TBD</p>
+                </td>
+              </tr>
             </tbody>
           </table>
           <p>
@@ -12304,6 +12316,12 @@ <h3>Selection</h3>
                 </td>
                 <td><code>AXSelectedChildrenChanged</code></td>
               </tr>
+              <tr>
+                <th>Android</th>
+                <td>
+                  <p>TBD</p>
+                </td>
+              </tr>
             </tbody>
           </table>
           <p>
@@ -12399,6 +12417,12 @@ <h3>Selection</h3>
                 </td>
                 <td><code>AXSelectedChildrenChanged</code></td>
               </tr>
+              <tr>
+                <th>Android</th>
+                <td>
+                  <p>TBD</p>
+                </td>
+              </tr>
             </tbody>
           </table>
         </section>
@@ -12460,6 +12484,12 @@ <h3>Special Events for Menus</h3>
                 <td><code>MenuClosedEvent</code>, then <code>MenuModeEndEvent</code></td>
                 <td><code>AXMenuClosedNotification</code></td>
               </tr>
+              <tr>
+                <th>Android</th>
+                <td>
+                  <p>TBD</p>
+                </td>
+              </tr>
             </tbody>
           </table>
         </section>

From ef58380f068329c6f20914edb8c12700e6d8f81a Mon Sep 17 00:00:00 2001
From: David Tseng <dtseng@google.com>
Date: Mon, 15 Dec 2025 15:32:56 -0800
Subject: [PATCH 2/3] Remove extra Android entries

---
 core-aam/index.html | 30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/core-aam/index.html b/core-aam/index.html
index a12bf725b..33dc2ab4d 100644
--- a/core-aam/index.html
+++ b/core-aam/index.html
@@ -12058,12 +12058,6 @@ <h3>Changes to document content or node visibility</h3>
                 <td><code>text_changed::delete</code> and <code>text_changed::insert</code></td>
                 <td>If in a <a class="termref">live region</a>, <code>AXLiveRegionChanged</code>.<br />If in <code>aria-errormessage</code>, <code>AXValidationErrorChanged</code>.</td>
               </tr>
-              <tr>
-                <th>Android</th>
-                <td>
-                  <p>TBD</p>
-                </td>
-              </tr>
             </tbody>
           </table>
           <p>
@@ -12153,12 +12147,6 @@ <h3>Changes to document content or node visibility</h3>
                   <p>If in a live region, <code>AXLiveRegionChanged</code></p>
                 </td>
               </tr>
-              <tr>
-                <th>Android</th>
-                <td>
-                  <p>TBD</p>
-                </td>
-              </tr>
             </tbody>
           </table>
           <p>
@@ -12316,12 +12304,6 @@ <h3>Selection</h3>
                 </td>
                 <td><code>AXSelectedChildrenChanged</code></td>
               </tr>
-              <tr>
-                <th>Android</th>
-                <td>
-                  <p>TBD</p>
-                </td>
-              </tr>
             </tbody>
           </table>
           <p>
@@ -12417,12 +12399,6 @@ <h3>Selection</h3>
                 </td>
                 <td><code>AXSelectedChildrenChanged</code></td>
               </tr>
-              <tr>
-                <th>Android</th>
-                <td>
-                  <p>TBD</p>
-                </td>
-              </tr>
             </tbody>
           </table>
         </section>
@@ -12484,12 +12460,6 @@ <h3>Special Events for Menus</h3>
                 <td><code>MenuClosedEvent</code>, then <code>MenuModeEndEvent</code></td>
                 <td><code>AXMenuClosedNotification</code></td>
               </tr>
-              <tr>
-                <th>Android</th>
-                <td>
-                  <p>TBD</p>
-                </td>
-              </tr>
             </tbody>
           </table>
         </section>

From 1cbca6e4627dba01d24226beb7423257f2556a77 Mon Sep 17 00:00:00 2001
From: David Tseng <dtseng@google.com>
Date: Tue, 25 Nov 2025 12:42:47 -0800
Subject: [PATCH 3/3] [core-aam]: fill in known Android role mappings

---
 core-aam/index.html | 100 ++++++++++++++++++++++----------------------
 1 file changed, 50 insertions(+), 50 deletions(-)

diff --git a/core-aam/index.html b/core-aam/index.html
index 33dc2ab4d..7432c1ed7 100644
--- a/core-aam/index.html
+++ b/core-aam/index.html
@@ -658,7 +658,7 @@ <h4 id="role-map-alert"><code>alert</code></h4>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.view.View</p>
                 </td>
               </tr>
             </tbody>
@@ -727,7 +727,7 @@ <h4 id="role-map-alertdialog"><code>alertdialog</code></h4>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.app.Dialog / android.app.AlertDialog</p>
                 </td>
               </tr>
             </tbody>
@@ -781,7 +781,7 @@ <h4 id="role-map-application"><code>application</code></h4>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.view.View</p>
                 </td>
               </tr>
             </tbody>
@@ -841,7 +841,7 @@ <h4 id="role-map-article"><code>article</code></h4>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.view.View</p>
                 </td>
               </tr>
             </tbody>
@@ -903,7 +903,7 @@ <h4 id="role-map-banner"><code>banner</code></h4>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.view.View</p>
                 </td>
               </tr>
             </tbody>
@@ -960,7 +960,7 @@ <h4 id="role-map-blockquote"><code>blockquote</code></h4>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.view.View</p>
                 </td>
               </tr>
             </tbody>
@@ -1013,7 +1013,7 @@ <h4 id="role-map-button"><code>button</code> with default values for <code>aria-
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.widget.Button</p>
                 </td>
               </tr>
             </tbody>
@@ -1065,7 +1065,7 @@ <h4 id="role-map-button-haspopup"><code>button</code> with non-<code>false</code
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.widget.Button</p>
                 </td>
               </tr>
             </tbody>
@@ -1119,7 +1119,7 @@ <h4 id="role-map-button-pressed"><code>button</code> with defined value for <cod
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.widget.ToggleButton</p>
                 </td>
               </tr>
             </tbody>
@@ -1173,7 +1173,7 @@ <h4 id="role-map-caption"><code>caption</code></h4>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.view.View</p>
                 </td>
               </tr>
             </tbody>
@@ -1235,7 +1235,7 @@ <h4 id="role-map-cell"><code>cell</code></h4>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.view.View</p>
                 </td>
               </tr>
             </tbody>
@@ -1294,7 +1294,7 @@ <h4 id="role-map-checkbox"><code>checkbox</code></h4>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.widget.CheckBox</p>
                 </td>
               </tr>
             </tbody>
@@ -1352,7 +1352,7 @@ <h4 id="role-map-code"><code>code</code></h4>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.view.View</p>
                 </td>
               </tr>
             </tbody>
@@ -1414,7 +1414,7 @@ <h4 id="role-map-columnheader"><code>columnheader</code></h4>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.view.View</p>
                 </td>
               </tr>
             </tbody>
@@ -1476,7 +1476,7 @@ <h4 id="role-map-combobox"><code>combobox</code></h4>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.widget.EditText</p>
                 </td>
               </tr>
             </tbody>
@@ -1533,7 +1533,7 @@ <h4 id="role-map-comment"><code>comment</code></h4>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.view.View</p>
                 </td>
               </tr>
             </tbody>
@@ -1595,7 +1595,7 @@ <h4 id="role-map-complementary"><code>complementary</code></h4>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.view.View</p>
                 </td>
               </tr>
             </tbody>
@@ -1657,7 +1657,7 @@ <h4 id="role-map-contentinfo"><code>contentinfo</code></h4>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.view.View</p>
                 </td>
               </tr>
             </tbody>
@@ -1713,7 +1713,7 @@ <h4 id="role-map-definition"><code>definition</code></h4>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.view.View</p>
                 </td>
               </tr>
             </tbody>
@@ -1770,7 +1770,7 @@ <h4 id="role-map-deletion"><code>deletion</code></h4>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.view.View</p>
                 </td>
               </tr>
             </tbody>
@@ -1824,7 +1824,7 @@ <h4 id="role-map-dialog"><code>dialog</code></h4>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.app.Dialog / android.app.AlertDialog</p>
                 </td>
               </tr>
             </tbody>
@@ -1876,7 +1876,7 @@ <h4 id="role-map-directory"><code>directory</code> (deprecated)</h4>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.view.View</p>
                 </td>
               </tr>
             </tbody>
@@ -1930,7 +1930,7 @@ <h4 id="role-map-document"><code>document</code></h4>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.view.View</p>
                 </td>
               </tr>
             </tbody>
@@ -2347,7 +2347,7 @@ <h4 id="role-map-grid"><code>grid</code></h4>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.widget.GridView</p>
                 </td>
               </tr>
             </tbody>
@@ -2413,7 +2413,7 @@ <h4 id="role-map-gridcell"><code>gridcell</code></h4>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.view.View</p>
                 </td>
               </tr>
             </tbody>
@@ -2633,7 +2633,7 @@ <h4 id="role-map-img"><code>img</code></h4>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.widget.Image / android.widget.ImageButton</p>
                 </td>
               </tr>
             </tbody>
@@ -2690,7 +2690,7 @@ <h4 id="role-map-insertion"><code>insertion</code></h4>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.view.View</p>
                 </td>
               </tr>
             </tbody>
@@ -2805,7 +2805,7 @@ <h4 id="role-map-list"><code>list</code></h4>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.widget.ListView</p>
                 </td>
               </tr>
             </tbody>
@@ -2869,7 +2869,7 @@ <h4 id="role-map-listbox"><code>listbox</code> without an accessibility parent o
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.widget.ListView</p>
                 </td>
               </tr>
             </tbody>
@@ -2991,7 +2991,7 @@ <h4 id="role-map-listitem"><code>listitem</code></h4>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.view.View</p>
                 </td>
               </tr>
             </tbody>
@@ -3476,7 +3476,7 @@ <h4 id="role-map-menuitem"><code>menuitem</code></h4>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.view.MenuItem</p>
                 </td>
               </tr>
             </tbody>
@@ -3539,7 +3539,7 @@ <h4 id="role-map-menuitemcheckbox"><code>menuitemcheckbox</code></h4>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.view.MenuItem</p>
                 </td>
               </tr>
             </tbody>
@@ -3604,7 +3604,7 @@ <h4 id="role-map-menuitemradio"><code>menuitemradio</code></h4>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.view.MenuItem</p>
                 </td>
               </tr>
             </tbody>
@@ -3664,7 +3664,7 @@ <h4 id="role-map-meter"><code>meter</code></h4>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.widget.ProgressBar</p>
                 </td>
               </tr>
             </tbody>
@@ -3903,7 +3903,7 @@ <h4 id="role-map-option"><code>option</code> not inside <code>combobox</code></h
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.view.View</p>
                 </td>
               </tr>
             </tbody>
@@ -4146,7 +4146,7 @@ <h4 id="role-map-progressbar"><code>progressbar</code></h4>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.widget.ProgressBar</p>
                 </td>
               </tr>
             </tbody>
@@ -4209,7 +4209,7 @@ <h4 id="role-map-radio"><code>radio</code></h4>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.widget.RadioButton</p>
                 </td>
               </tr>
             </tbody>
@@ -4261,7 +4261,7 @@ <h4 id="role-map-radiogroup"><code>radiogroup</code></h4>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.widget.RadioGroup</p>
                 </td>
               </tr>
             </tbody>
@@ -4428,7 +4428,7 @@ <h4 id="role-map-row"><code>row</code> not inside <code>treegrid</code></h4>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.view.View</p>
                 </td>
               </tr>
             </tbody>
@@ -4533,7 +4533,7 @@ <h4 id="role-map-rowgroup"><code>rowgroup</code></h4>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.view.View</p>
                 </td>
               </tr>
             </tbody>
@@ -4589,7 +4589,7 @@ <h4 id="role-map-rowheader"><code>rowheader</code></h4>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.view.View</p>
                 </td>
               </tr>
             </tbody>
@@ -4775,7 +4775,7 @@ <h4 id="role-map-searchbox"><code>searchbox</code></h4>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.widget.EditText</p>
                 </td>
               </tr>
             </tbody>
@@ -5066,7 +5066,7 @@ <h4 id="role-map-slider"><code>slider</code></h4>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.widget.SeekBar</p>
                 </td>
               </tr>
             </tbody>
@@ -5128,7 +5128,7 @@ <h4 id="role-map-spinbutton"><code>spinbutton</code></h4>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.widget.EditText</p>
                 </td>
               </tr>
             </tbody>
@@ -5497,7 +5497,7 @@ <h4 id="role-map-switch"><code>switch</code></h4>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.widget.Switch</p>
                 </td>
               </tr>
             </tbody>
@@ -5626,7 +5626,7 @@ <h4 id="role-map-table"><code>table</code></h4>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.widget.GridView</p>
                 </td>
               </tr>
             </tbody>
@@ -5690,7 +5690,7 @@ <h4 id="role-map-tablist"><code>tablist</code></h4>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.widget.TabWidget</p>
                 </td>
               </tr>
             </tbody>
@@ -5858,7 +5858,7 @@ <h4 id="role-map-textbox"><code>textbox</code> when <code>aria-multiline</code>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.widget.EditText</p>
                 </td>
               </tr>
             </tbody>
@@ -5978,7 +5978,7 @@ <h4 id="role-map-time"><code>time</code></h4>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.widget.TimePicker</p>
                 </td>
               </tr>
             </tbody>
@@ -6278,7 +6278,7 @@ <h4 id="role-map-treegrid"><code>treegrid</code></h4>
               <tr>
                 <th>Android</th>
                 <td>
-                  <p>TBD</p>
+                  <p>android.widget.GridView</p>
                 </td>
               </tr>
             </tbody>