From b6d33517396e589d4024bd72e249890b8ead480d Mon Sep 17 00:00:00 2001
From: Sean Lip <sll@google.com>
Date: Wed, 17 Aug 2016 16:21:50 -0700
Subject: [PATCH] Add more indicators to move to the right to view the submenu.

---
 accessible/app.component.js   | 4 ++--
 accessible/field.component.js | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/accessible/app.component.js b/accessible/app.component.js
index 5d00ed36b..e1c4329d3 100644
--- a/accessible/app.component.js
+++ b/accessible/app.component.js
@@ -51,8 +51,8 @@ blocklyApp.AppView = ng.core
     <label aria-hidden="true" hidden id="blockly-block-summary">{{'BLOCK_SUMMARY'|translate}}</label>
     <label aria-hidden="true" hidden id="blockly-more-options">{{'MORE_OPTIONS'|translate}}</label>
     <label aria-hidden="true" hidden id="blockly-submenu-indicator">{{'SUBMENU_INDICATOR'|translate}}</label>
-    <label aria-hidden="true" hidden id="blockly-toolbox-block">{{'TOOLBOX_BLOCK'|translate}}</label>
-    <label aria-hidden="true" hidden id="blockly-workspace-block">{{'WORKSPACE_BLOCK'|translate}}</label>
+    <label aria-hidden="true" hidden id="blockly-toolbox-block">{{'TOOLBOX_BLOCK'|translate}} {{'SUBMENU_INDICATOR'|translate}}</label>
+    <label aria-hidden="true" hidden id="blockly-workspace-block">{{'WORKSPACE_BLOCK'|translate}} {{'SUBMENU_INDICATOR'|translate}}</label>
     <label aria-hidden="true" hidden id="blockly-button">{{'BUTTON'|translate}}</label>
     <label aria-hidden="true" hidden id="blockly-disabled">{{'DISABLED'|translate}}</label>
     <label aria-hidden="true" hidden id="blockly-menu">{{'OPTION_LIST'|translate}}</label>
diff --git a/accessible/field.component.js b/accessible/field.component.js
index 7affe7e53..b8e7d79be 100644
--- a/accessible/field.component.js
+++ b/accessible/field.component.js
@@ -38,9 +38,10 @@ blocklyApp.FieldComponent = ng.core
            [attr.aria-label]="disabled ? 'Disabled number field' : 'Press Enter to edit number'"
            tabindex="-1">
 
-    <div *ngIf="isDropdown()"
-         [attr.aria-labelledBy]="generateAriaLabelledByAttr('blockly-argument-menu', idMap['label'])">
-      <label [id]="mainFieldId">{{'CURRENT_ARGUMENT_VALUE'|translate}} {{field.getText()}}</label>
+    <div *ngIf="isDropdown()">
+      <label [id]="mainFieldId" [attr.aria-label]="('CURRENT_ARGUMENT_VALUE'|translate) + ' ' + field.getText() + ' Move right to view submenu'">
+        {{'CURRENT_ARGUMENT_VALUE'|translate}} {{field.getText()}}
+      </label>
       <ol role="group">
         <li [id]="idMap[optionValue]" role="treeitem" *ngFor="#optionValue of getOptions()"
             [attr.aria-labelledBy]="generateAriaLabelledByAttr(idMap[optionValue + 'Button'], 'blockly-button')">